[timblserver] 73/76: Imported Upstream version 1.7
Joost van Baal
joostvb at moszumanska.debian.org
Wed Sep 3 17:14:15 UTC 2014
This is an automated email from the git hooks/post-receive script.
joostvb pushed a commit to branch master
in repository timblserver.
commit 39a46ee8ab4d0b63c727a1e2ece05f4c7de65f0b
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date: Wed Sep 3 18:59:34 2014 +0200
Imported Upstream version 1.7
---
ChangeLog | 138 ++++++
Makefile.in | 87 ++--
NEWS | 16 +-
README | 2 +-
aclocal.m4 | 70 ++-
bootstrap | 4 +-
config.guess | 49 ++-
config.h.in | 62 +--
config.sub | 65 +--
configure | 826 ++++++++++++++---------------------
configure.ac | 106 ++---
demos/Makefile.in | 36 +-
demos/sockettestClient.cxx | 6 +-
demos/sockettestServer.cxx | 6 +-
depcomp | 74 +++-
docs/Makefile.in | 42 +-
docs/timblserver.1 | 6 +-
include/Makefile.in | 32 +-
include/timblserver/ClientBase.h | 6 +-
include/timblserver/FdStream.h | 4 +-
include/timblserver/Makefile.in | 42 +-
include/timblserver/ServerBase.h | 8 +-
include/timblserver/SocketBasics.h | 4 +-
include/timblserver/TimblServerAPI.h | 4 +-
ltmain.sh | 95 ++--
m4/Makefile.in | 32 +-
m4/ax_lib_socket_nsl.m4 | 40 ++
m4/ax_type_socklen_t.m4 | 61 +++
m4/ltversion.m4 | 10 +-
missing | 53 +--
src/ClientBase.cxx | 11 +-
src/FdStream.cxx | 4 +-
src/Makefile.am | 4 +-
src/Makefile.in | 48 +-
src/ServerBase.cxx | 26 +-
src/SocketBasics.cxx | 28 +-
src/TimblClient.cxx | 4 +-
src/TimblServer.cxx | 12 +-
src/TimblServerAPI.cxx | 4 +-
39 files changed, 1157 insertions(+), 970 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fbf297a..a56b185 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,141 @@
+2013-04-03 15:48 sloot
+
+ * [r15922] src/Makefile.am: increment current library version
+
+2013-04-03 12:30 sloot
+
+ * [r15900] NEWS, configure.ac: some NEWS
+
+2013-04-02 16:06 sloot
+
+ * [r15880] configure.ac: we need the latest an greatest ticcutils
+
+2013-04-02 15:46 sloot
+
+ * [r15874] src/ServerBase.cxx: adapted to change in
+ ticcutils::XMLtools
+
+2013-04-02 14:06 sloot
+
+ * [r15869] src/ServerBase.cxx: adapted to changes in XMLtools
+
+2013-04-02 09:37 sloot
+
+ * [r15855] src/ServerBase.cxx: Timer class is moved
+
+2013-03-28 11:56 sloot
+
+ * [r15829] demos/sockettestClient.cxx, demos/sockettestServer.cxx,
+ src/ClientBase.cxx, src/SocketBasics.cxx, src/TimblServer.cxx:
+ adapte to new ticcutils
+
+2013-03-07 10:04 sloot
+
+ * [r15782] src/ServerBase.cxx: don't append a slash to the
+ filenames when not running as a daemon
+
+2013-03-07 09:51 sloot
+
+ * [r15780] docs/timblserver.1: fix man page
+
+2013-01-07 14:44 sloot
+
+ * [r15566] demos/sockettestClient.cxx, demos/sockettestServer.cxx,
+ include/timblserver/ClientBase.h, include/timblserver/FdStream.h,
+ include/timblserver/ServerBase.h,
+ include/timblserver/SocketBasics.h,
+ include/timblserver/TimblServerAPI.h, src/ClientBase.cxx,
+ src/FdStream.cxx, src/ServerBase.cxx, src/SocketBasics.cxx,
+ src/TimblClient.cxx, src/TimblServer.cxx, src/TimblServerAPI.cxx:
+ bump year
+
+2012-10-30 12:53 mvgompel
+
+ * [r15369] bootstrap: bootstrap fix
+
+2012-10-11 13:48 sloot
+
+ * [r15291] configure.ac: Bumped version after Release
+
+2012-10-11 13:34 sloot
+
+ * [r15289] NEWS: get ready for release
+
+2012-10-10 12:21 sloot
+
+ * [r15272] configure.ac: needs modern ticcutils
+
+2012-09-18 10:23 sloot
+
+ * [r15197] src/SocketBasics.cxx: make shure that a failure is
+ detected!
+
+2012-08-09 10:03 sloot
+
+ * [r15086] src/ClientBase.cxx, src/TimblServer.cxx: ticcutils ftw
+
+2012-08-08 08:27 sloot
+
+ * [r15059] include/timblserver/ServerBase.h, src/ServerBase.cxx:
+ LogStream has a namespace
+
+2012-08-07 15:40 sloot
+
+ * [r15051] include/timblserver/ClientBase.h,
+ include/timblserver/ServerBase.h: fixed
+
+2012-08-07 15:00 sloot
+
+ * [r15047] configure.ac: wee need ticcutils
+
+2012-06-20 08:11 sloot
+
+ * [r14898] configure.ac: bump version after Release
+
+2012-06-19 13:03 sloot
+
+ * [r14890] NEWS: updated
+
+2012-05-14 15:43 sloot
+
+ * [r14744] src/ServerBase.cxx: argl. ugly bug. Detected by clang++!
+
+2012-01-12 16:54 sloot
+
+ * [r13994] timblserver.spec, timblserver.spec.README: were moved to
+ Timbl-dev/rpm
+
+2012-01-10 16:19 sloot
+
+ * [r13939] configure.ac, src/SocketBasics.cxx: attempt to clean up
+ configuration
+ Do we still want to build demos?
+
+2012-01-02 16:39 sloot
+
+ * [r13847] README, demos/sockettestClient.cxx,
+ demos/sockettestServer.cxx, include/timblserver/ClientBase.h,
+ include/timblserver/FdStream.h, include/timblserver/ServerBase.h,
+ include/timblserver/SocketBasics.h,
+ include/timblserver/TimblServerAPI.h, src/ClientBase.cxx,
+ src/FdStream.cxx, src/ServerBase.cxx, src/SocketBasics.cxx,
+ src/TimblClient.cxx, src/TimblServer.cxx, src/TimblServerAPI.cxx:
+ 2011 ==> 2012
+
+2011-12-29 08:11 joostvb
+
+ * [r13812] docs/timblserver.1: fix typo: s/simbl/timbl/
+
+2011-12-21 08:43 sloot
+
+ * [r13748] configure.ac: Bumped version after Release
+
+2011-12-20 15:58 sloot
+
+ * [r13735] configure.ac, src/FdStream.cxx, src/SocketBasics.cxx:
+ some typos
+ depends on timbl 4.6.2 (just to be sure ...)
+
2011-12-20 12:06 sloot
* [r13728] NEWS: get ready for release
diff --git a/Makefile.in b/Makefile.in
index 2c7aac0..5d513c1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -45,10 +45,13 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
depcomp install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
- $(top_srcdir)/m4/ax_openmp.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \
+ $(top_srcdir)/m4/ax_openmp.m4 \
+ $(top_srcdir)/m4/ax_type_socklen_t.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -87,6 +90,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
DATA = $(pkgconfig_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
@@ -101,9 +110,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d "$(distdir)" \
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr "$(distdir)"; }; }
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -132,6 +143,8 @@ am__relativize = \
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -256,6 +269,8 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+ticcutils_CFLAGS = @ticcutils_CFLAGS@
+ticcutils_LIBS = @ticcutils_LIBS@
timbl_CFLAGS = @timbl_CFLAGS@
timbl_LIBS = @timbl_LIBS@
top_build_prefix = @top_build_prefix@
@@ -270,7 +285,7 @@ all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-am--refresh:
+am--refresh: Makefile
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
@@ -306,10 +321,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -349,9 +362,7 @@ uninstall-pkgconfigDATA:
@$(NORMAL_UNINSTALL)
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -560,7 +571,11 @@ dist-gzip: distdir
$(am__remove_distdir)
dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-lzip: distdir
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__remove_distdir)
dist-lzma: distdir
@@ -568,7 +583,7 @@ dist-lzma: distdir
$(am__remove_distdir)
dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__remove_distdir)
dist-tarZ: distdir
@@ -599,6 +614,8 @@ distcheck: dist
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
@@ -618,6 +635,7 @@ distcheck: dist
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -646,8 +664,16 @@ distcheck: dist
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @$(am__cd) '$(distuninstallcheck_dir)' \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ @test -n '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: trying to run $@ with an empty' \
+ '$$(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ $(am__cd) '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
@@ -681,10 +707,15 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -772,8 +803,8 @@ uninstall-am: uninstall-pkgconfigDATA
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
- distcheck distclean distclean-generic distclean-hdr \
+ dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
diff --git a/NEWS b/NEWS
index 54e0164..e143bfc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,20 @@
-# $Id: NEWS 13728 2011-12-20 12:06:06Z sloot $
+# $Id: NEWS 15900 2013-04-03 12:30:35Z sloot $
# $URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/NEWS $
+1.7 - 2013-04-03
+ * use more ticcutils stuff
+ * fixed problem with pid and logfile paths when --deamonize=no
+
+1.6 - 2012-10-11
+[Ko van der Sloot]
+ * This version is build on ticcutils too
+
+1.5 - 2012-06-19
+[Ko van der Sloot]
+ * Some typos edited
+ * Small bug fixes
+ * configue.ac modernized
+
1.4 - 2011-12-20
[ Ko van de Sloot]
* small code change to satisfy '-pedantic'
diff --git a/README b/README
index 827fd7d..9a693b0 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-TimblServer 1.0.0 (c) ILK/CLiPS 1998 - 2011
+TimblServer 1.0.0 (c) ILK/CLiPS 1998 - 2012
Tilburg Memory Based Learner
diff --git a/aclocal.m4 b/aclocal.m4
index afb2350..d8bf0b7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -19,12 +20,15 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -34,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.3], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,19 +54,21 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -144,14 +150,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 10
+# serial 12
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -191,6 +197,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -255,7 +262,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -320,10 +327,13 @@ AC_DEFUN([AM_DEP_TRACK],
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -545,12 +555,15 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@@ -682,12 +695,15 @@ else
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_MKDIR_P
# ---------------
# Check for `mkdir -p'.
@@ -710,13 +726,14 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -724,13 +741,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -806,12 +823,14 @@ Check your system clock])
fi
AC_MSG_RESULT(yes)])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_INSTALL_STRIP
# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
@@ -834,13 +853,13 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
+# serial 3
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
@@ -849,13 +868,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -877,10 +896,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
@@ -950,7 +970,9 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([m4/acx_pthread.m4])
+m4_include([m4/ax_lib_socket_nsl.m4])
m4_include([m4/ax_openmp.m4])
+m4_include([m4/ax_type_socklen_t.m4])
m4_include([m4/libtool.m4])
m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4])
diff --git a/bootstrap b/bootstrap
index febf0f5..280dc5c 100644
--- a/bootstrap
+++ b/bootstrap
@@ -1,4 +1,4 @@
-# $Id: bootstrap 8312 2011-02-13 15:33:17Z joostvb $
+# $Id: bootstrap 15369 2012-10-30 12:53:08Z mvgompel $
# $URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/bootstrap $
# bootstrap - script to bootstrap the distribution rolling engine
@@ -38,7 +38,7 @@ aclocal=aclocal
# svn log --verbose > ChangeLog
#}
-if $automake --version|head -1 |grep '1\.[4-9]'; then
+if $automake --version|head -1 |grep ' 1\.[4-9]'; then
echo "automake 1.4-1.9 is active. You should use automake 1.10 or later"
if test -f /etc/debian_version; then
echo " sudo apt-get install automake"
diff --git a/config.guess b/config.guess
index 40eaed4..d622a44 100755
--- a/config.guess
+++ b/config.guess
@@ -2,9 +2,9 @@
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2011-05-11'
+timestamp='2012-02-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2011-05-11'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
@@ -792,13 +790,12 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- case ${UNAME_MACHINE} in
- pc98)
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ case ${UNAME_PROCESSOR} in
amd64)
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
exit ;;
i*:CYGWIN*:*)
@@ -807,6 +804,9 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
+ i*:MSYS*:*)
+ echo ${UNAME_MACHINE}-pc-msys
+ exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
@@ -861,6 +861,13 @@ EOF
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -895,13 +902,16 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
crisv32:Linux:*:*)
- echo crisv32-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ hexagon:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
LIBC=gnu
@@ -943,7 +953,7 @@ EOF
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
@@ -978,13 +988,13 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-tilera-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -1315,6 +1325,9 @@ EOF
i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros
exit ;;
+ x86_64:VMkernel:*:*)
+ echo ${UNAME_MACHINE}-unknown-esx
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/config.h.in b/config.h.in
index 592cfcf..a4a9057 100644
--- a/config.h.in
+++ b/config.h.in
@@ -3,17 +3,14 @@
/* Define to 1 if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
-/* Define to 1 if you have the `daemon' function. */
-#undef HAVE_DAEMON
-
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the `dup2' function. */
#undef HAVE_DUP2
-/* Define to 1 if you have the `floor' function. */
-#undef HAVE_FLOOR
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
/* Define to 1 if you have the `fork' function. */
#undef HAVE_FORK
@@ -27,22 +24,12 @@
/* Define to 1 if you have the `gethostbyname' function. */
#undef HAVE_GETHOSTBYNAME
-/* Define to 1 if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
-
/* Define to 1 if you have the `inet_ntoa' function. */
#undef HAVE_INET_NTOA
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define to 1 if you have the `localtime_r' function. */
-#undef HAVE_LOCALTIME_R
-
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
- to 0 otherwise. */
-#undef HAVE_MALLOC
-
/* Define to 1 if you have the `memmove' function. */
#undef HAVE_MEMMOVE
@@ -58,21 +45,12 @@
/* Define to 1 if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
-/* Define to 1 if you have the `pow' function. */
-#undef HAVE_POW
-
/* Define if you have POSIX threads libraries and header files. */
#undef HAVE_PTHREAD
-/* Define to 1 if you have the `rint' function. */
-#undef HAVE_RINT
-
/* Define to 1 if you have the `socket' function. */
#undef HAVE_SOCKET
-/* Define to 1 if you have the `sqrt' function. */
-#undef HAVE_SQRT
-
/* Define to 1 if stdbool.h conforms to C99. */
#undef HAVE_STDBOOL_H
@@ -82,15 +60,9 @@
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
/* Define to 1 if you have the `strerror' function. */
#undef HAVE_STRERROR
-/* Define to 1 if you have the `strftime' function. */
-#undef HAVE_STRFTIME
-
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
@@ -103,21 +75,12 @@
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
-/* Define to 1 if you have the <sys/timeb.h> header file. */
-#undef HAVE_SYS_TIMEB_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define to 1 if you have the <unistd.h,fcntl.h> header file. */
-#undef HAVE_UNISTD_H_FCNTL_H
-
/* Define to 1 if you have the `vfork' function. */
#undef HAVE_VFORK
@@ -162,42 +125,27 @@
your system. */
#undef PTHREAD_CREATE_JOINABLE
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* "sock_len" */
-#undef TIMBL_SOCKLEN_T
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-
/* Version number of package */
#undef VERSION
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
#undef inline
#endif
-/* Define to rpl_malloc if the replacement function should be used. */
-#undef malloc
-
/* Define to `int' if <sys/types.h> does not define. */
#undef pid_t
/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
+/* Substitute for socklen_t */
+#undef socklen_t
+
/* Define to `int' if <sys/types.h> does not define. */
#undef ssize_t
diff --git a/config.sub b/config.sub
index 30fdca8..c894da4 100755
--- a/config.sub
+++ b/config.sub
@@ -2,9 +2,9 @@
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2011-03-23'
+timestamp='2012-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2011-03-23'
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@ version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,6 +130,10 @@ case $maybe_os in
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
@@ -247,17 +249,22 @@ case $basic_machine in
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | be32 | be64 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
+ | epiphany \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep | metag \
@@ -291,7 +298,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
- | rx \
+ | rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
@@ -300,7 +307,7 @@ case $basic_machine in
| spu \
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
- | v850 | v850e \
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -315,8 +322,7 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- # Motorola 68HC11/12.
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -329,7 +335,10 @@ case $basic_machine in
strongarm | thumb | xscale)
basic_machine=arm-unknown
;;
-
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
xscaleeb)
basic_machine=armeb-unknown
;;
@@ -352,11 +361,13 @@ case $basic_machine in
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
@@ -365,8 +376,10 @@ case $basic_machine in
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -400,7 +413,7 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | romp-* | rs6000-* | rx-* \
+ | rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -408,10 +421,11 @@ case $basic_machine in
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile-* | tilegx-* \
+ | tile*-* \
| tron-* \
| ubicom32-* \
- | v850-* | v850e-* | vax-* \
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -711,7 +725,6 @@ case $basic_machine in
i370-ibm* | ibm*)
basic_machine=i370-ibm
;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
@@ -808,10 +821,18 @@ case $basic_machine in
ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
+ msys)
+ basic_machine=i386-pc
+ os=-msys
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
;;
+ nacl)
+ basic_machine=le32-unknown
+ os=-nacl
+ ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
@@ -1120,13 +1141,8 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
- # This must be matched before tile*.
- tilegx*)
- basic_machine=tilegx-unknown
- os=-linux-gnu
- ;;
tile*)
- basic_machine=tile-unknown
+ basic_machine=$basic_machine-unknown
os=-linux-gnu
;;
tx39)
@@ -1336,7 +1352,7 @@ case $os in
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1548,9 +1564,6 @@ case $basic_machine in
;;
m68000-sun)
os=-sunos3
- # This also exists in the configure program, but was not the
- # default.
- # os=-sunos4
;;
m68*-cisco)
os=-aout
diff --git a/configure b/configure
index 6a67cca..30e9d36 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for timblserver 1.4.
+# Generated by GNU Autoconf 2.68 for timblserver 1.7.
#
# Report bugs to <timbl at uvt.nl>.
#
@@ -569,8 +569,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='timblserver'
PACKAGE_TARNAME='timblserver'
-PACKAGE_VERSION='1.4'
-PACKAGE_STRING='timblserver 1.4'
+PACKAGE_VERSION='1.7'
+PACKAGE_STRING='timblserver 1.7'
PACKAGE_BUGREPORT='timbl at uvt.nl'
PACKAGE_URL=''
@@ -614,14 +614,16 @@ ac_includes_default="\
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
+LIBOBJS
+WANT_OMP_FALSE
+WANT_OMP_TRUE
+ticcutils_LIBS
+ticcutils_CFLAGS
timbl_LIBS
timbl_CFLAGS
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
-LIBOBJS
-WANT_OMP_FALSE
-WANT_OMP_TRUE
PTHREAD_CFLAGS
PTHREAD_LIBS
PTHREAD_CC
@@ -667,6 +669,7 @@ RANLIB
am__fastdepCXX_FALSE
am__fastdepCXX_TRUE
CXXDEPMODE
+am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
@@ -753,6 +756,7 @@ with_gnu_ld
with_sysroot
enable_libtool_lock
with_timbl
+with_ticcutils
'
ac_precious_vars='build_alias
host_alias
@@ -771,7 +775,9 @@ PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
timbl_CFLAGS
-timbl_LIBS'
+timbl_LIBS
+ticcutils_CFLAGS
+ticcutils_LIBS'
# Initialize some variables set by options.
@@ -1314,7 +1320,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures timblserver 1.4 to adapt to many kinds of systems.
+\`configure' configures timblserver 1.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1384,7 +1390,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of timblserver 1.4:";;
+ short | recursive ) echo "Configuration of timblserver 1.7:";;
esac
cat <<\_ACEOF
@@ -1411,6 +1417,9 @@ Optional Packages:
--with-timbl=DIR use timbl installed in <DIR>;
note that you can install timbl in a non-default directory with
./configure --prefix=<DIR> in the timbl installation directory
+ --with-ticcutils=DIR use libticcutils installed in <DIR>;
+ note that you can install libticcutils in a non-default directory with
+ ./configure --prefix=<DIR> in the libticutils installation directory
Some influential environment variables:
CXX C++ compiler command
@@ -1432,6 +1441,10 @@ Some influential environment variables:
timbl_CFLAGS
C compiler flags for timbl, overriding pkg-config
timbl_LIBS linker flags for timbl, overriding pkg-config
+ ticcutils_CFLAGS
+ C compiler flags for ticcutils, overriding pkg-config
+ ticcutils_LIBS
+ linker flags for ticcutils, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1499,7 +1512,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-timblserver configure 1.4
+timblserver configure 1.7
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2152,7 +2165,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by timblserver $as_me 1.4, which was
+It was created by timblserver $as_me 1.7, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2967,7 +2980,7 @@ fi
# Define the identity of the package.
PACKAGE='timblserver'
- VERSION='1.4'
+ VERSION='1.7'
cat >>confdefs.h <<_ACEOF
@@ -2997,11 +3010,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
@@ -3581,6 +3594,7 @@ fi
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
@@ -3605,6 +3619,7 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -3664,7 +3679,7 @@ else
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -3825,8 +3840,8 @@ esac
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
@@ -4535,6 +4550,7 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -4594,7 +4610,7 @@ else
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -15608,80 +15624,9 @@ if test x"$acx_pthread_ok" = xyes; then
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenMP flag of C++ compiler" >&5
-$as_echo_n "checking for OpenMP flag of C++ compiler... " >&6; }
-if ${ax_cv_cxx_openmp+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- saveCXXFLAGS=$CXXFLAGS
-ax_cv_cxx_openmp=unknown
-# Flags to try: -fopenmp (gcc), -openmp (icc), -mp (SGI & PGI),
-# -xopenmp (Sun), -omp (Tru64), -qsmp=omp (AIX), none
-ax_openmp_flags="-fopenmp -openmp -mp -xopenmp -omp -qsmp=omp none"
-if test "x$OPENMP_CXXFLAGS" != x; then
- ax_openmp_flags="$OPENMP_CXXFLAGS $ax_openmp_flags"
-fi
-for ax_openmp_flag in $ax_openmp_flags; do
- case $ax_openmp_flag in
- none) CXXFLAGS=$saveCXX ;;
- *) CXXFLAGS="$saveCXXFLAGS $ax_openmp_flag" ;;
- esac
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char omp_set_num_threads ();
-int
-main ()
-{
-return omp_set_num_threads ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- ax_cv_cxx_openmp=$ax_openmp_flag; break
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-done
-CXXFLAGS=$saveCXXFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_openmp" >&5
-$as_echo "$ax_cv_cxx_openmp" >&6; }
-if test "x$ax_cv_cxx_openmp" = "xunknown"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: We don't seem to have Open MP " >&5
-$as_echo "$as_me: We don't seem to have Open MP " >&6;}
-else
- if test "x$ax_cv_cxx_openmp" != "xnone"; then
- OPENMP_CXXFLAGS=$ax_cv_cxx_openmp
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: we have Open MP " >&5
-$as_echo "$as_me: we have Open MP " >&6;}
- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
-fi
-
-
- if test "$OPENMP_CXXFLAGS" != "" ; then
- WANT_OMP_TRUE=
- WANT_OMP_FALSE='#'
-else
- WANT_OMP_TRUE='#'
- WANT_OMP_FALSE=
-fi
-
-
# Checks for header files.
-for ac_header in arpa/inet.h netdb.h netinet/in.h sys/socket.h sys/time.h sys/timeb.h unistd.h,fcntl.h
+for ac_header in arpa/inet.h fcntl.h netdb.h netinet/in.h sys/socket.h unistd.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -15830,83 +15775,25 @@ _ACEOF
;;
esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ac_fn_cxx_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
+if test "x$ac_cv_type_ssize_t" = xyes; then :
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset[2];
- const charset cs;
- /* SunOS 4.1.1 cc rejects this. */
- char const *const *pcpcc;
- char **ppc;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
- /* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
- pcpcc = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
- ++pcpcc;
- ppc = (char**) pcpcc;
- pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
- if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
- const int *foo = &x[0];
- ++foo;
- }
- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
- typedef const int *iptr;
- iptr p = 0;
- ++p;
- }
- { /* AIX XL C 1.02.0.0 rejects this saying
- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
- if (!foo) return 0;
- }
- return !cs[0] && !zero.x;
-#endif
+else
- ;
- return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define ssize_t int
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_c_const=yes
-else
- ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-$as_echo "#define const /**/" >>confdefs.h
+ac_fn_cxx_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
fi
@@ -15921,6 +15808,8 @@ _ACEOF
fi
+
+# Checks for library functions.
for ac_header in vfork.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
@@ -16134,23 +16023,26 @@ $as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
fi
-for ac_func in strftime
+for ac_func in getaddrinfo gethostbyaddr gethostbyname inet_ntoa memset socket strerror dup2 memmove
do :
- ac_fn_cxx_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
-if test "x$ac_cv_func_strftime" = xyes; then :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
-#define HAVE_STRFTIME 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-else
- # strftime is in -lintl on SCO UNIX.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
-$as_echo_n "checking for strftime in -lintl... " >&6; }
-if ${ac_cv_lib_intl_strftime+:} false; then :
+fi
+done
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
+$as_echo_n "checking for library containing gethostbyname... " >&6; }
+if ${ac_cv_search_gethostbyname+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+ ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -16160,394 +16052,179 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char strftime ();
+char gethostbyname ();
int
main ()
{
-return strftime ();
+return gethostbyname ();
;
return 0;
}
_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- ac_cv_lib_intl_strftime=yes
-else
- ac_cv_lib_intl_strftime=no
+for ac_lib in '' nsl; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_search_gethostbyname=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
-$as_echo "$ac_cv_lib_intl_strftime" >&6; }
-if test "x$ac_cv_lib_intl_strftime" = xyes; then :
- $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
-
-LIBS="-lintl $LIBS"
-fi
-
+ conftest$ac_exeext
+ if ${ac_cv_search_gethostbyname+:} false; then :
+ break
fi
done
+if ${ac_cv_search_gethostbyname+:} false; then :
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
- $as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_header_time=yes
-else
- ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
-
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <time.h>
-
-int
-main ()
-{
-struct tm tm;
- int *p = &tm.tm_sec;
- return !p;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_struct_tm=time.h
-else
- ac_cv_struct_tm=sys/time.h
+ ac_cv_search_gethostbyname=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-$as_echo "$ac_cv_struct_tm" >&6; }
-if test $ac_cv_struct_tm = sys/time.h; then
-
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5
+$as_echo "$ac_cv_search_gethostbyname" >&6; }
+ac_res=$ac_cv_search_gethostbyname
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
+$as_echo_n "checking for library containing socket... " >&6; }
+if ${ac_cv_search_socket+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <sys/types.h>
-#include <signal.h>
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char socket ();
int
main ()
{
-return *(signal (0, 0)) (0) == 1;
+return socket ();
;
return 0;
}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_type_signal=int
-else
- ac_cv_type_signal=void
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-ac_fn_cxx_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define ssize_t int
-_ACEOF
-
-fi
-
-ac_fn_cxx_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-ac_fn_cxx_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
-
+for ac_lib in '' socket; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_search_socket=$ac_res
fi
-
-
-# Checks for library functions.
-for ac_header in stdlib.h
-do :
- ac_fn_cxx_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_STDLIB_H 1
-_ACEOF
-
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_socket+:} false; then :
+ break
fi
-
done
+if ${ac_cv_search_socket+:} false; then :
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- ac_cv_func_malloc_0_nonnull=no
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
-
-int
-main ()
-{
-return ! malloc (0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
- ac_cv_func_malloc_0_nonnull=yes
-else
- ac_cv_func_malloc_0_nonnull=no
+ ac_cv_search_socket=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes; then :
-
-$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
+$as_echo "$ac_cv_search_socket" >&6; }
+ac_res=$ac_cv_search_socket
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
else
- $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
-
- case " $LIBOBJS " in
- *" malloc.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
- ;;
-esac
-
-$as_echo "#define malloc rpl_malloc" >>confdefs.h
-
-fi
-
-
-for ac_func in floor getaddrinfo gethostbyaddr gethostbyname gettimeofday inet_ntoa localtime_r memset pow rint socket sqrt strchr strerror daemon dup2 memmove
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-checkBoth=0
-ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = xyes; then :
-
-fi
-
-if test "$ac_cv_func_connect" = "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lsocket" >&5
-$as_echo_n "checking for main in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_main+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
+$as_echo_n "checking for socket in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_socket+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
+LIBS="-lsocket -lnsl $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char socket ();
int
main ()
{
-return main ();
+return socket ();
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
- ac_cv_lib_socket_main=yes
+ ac_cv_lib_socket_socket=yes
else
- ac_cv_lib_socket_main=no
+ ac_cv_lib_socket_socket=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_main" >&5
-$as_echo "$ac_cv_lib_socket_main" >&6; }
-if test "x$ac_cv_lib_socket_main" = xyes; then :
- LIBS="$LIBS -lsocket"
-else
- checkBoth=1
-fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
+$as_echo "$ac_cv_lib_socket_socket" >&6; }
+if test "x$ac_cv_lib_socket_socket" = xyes; then :
+ LIBS="-lsocket -lnsl $LIBS"
fi
-if test "$checkBoth" = "1"; then
- oldLibs=$LIBS
- LIBS="$LIBS -lsocket -lnsl"
- ac_fn_cxx_check_func "$LINENO" "accept" "ac_cv_func_accept"
-if test "x$ac_cv_func_accept" = xyes; then :
-else
- LIBS=$oldLibs
fi
-fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
$as_echo_n "checking for socklen_t... " >&6; }
-if ${ac_cv_check_socklen_t+:} false; then :
+if ${ac_cv_ax_type_socklen_t+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_cv_check_socklen_t=''
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/socket.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define try 1
-#ifdef AIX
-#if AIX >= 51
-#define try 0
-#endif
-#endif
-#if try
-extern int accept(int, struct sockaddr *, socklen_t *);
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_check_socklen_t=socklen_t
-else
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
#include <sys/types.h>
-#include <sys/socket.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define try 1
-#ifdef AIX
-#if AIX >= 42
-#define try 0
-#endif
-#endif
-#if try
-extern int accept(int, struct sockaddr *, size_t t *);
-#endif
-#ifdef __cplusplus
-}
-#endif
-
+ #include <sys/socket.h>
int
main ()
{
-
+socklen_t len = 42; return 0;
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_check_socklen_t=size_t
+ ac_cv_ax_type_socklen_t=yes
else
- ac_cv_check_socklen_t=int
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
+ ac_cv_ax_type_socklen_t=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ax_type_socklen_t" >&5
+$as_echo "$ac_cv_ax_type_socklen_t" >&6; }
+ if test $ac_cv_ax_type_socklen_t != yes; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_check_socklen_t" >&5
-$as_echo "$ac_cv_check_socklen_t" >&6; }
+$as_echo "#define socklen_t int" >>confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define TIMBL_SOCKLEN_T $ac_cv_check_socklen_t
-_ACEOF
+ fi
# Checks for timbl library.
@@ -16695,12 +16372,12 @@ if test -n "$timbl_CFLAGS"; then
pkg_cv_timbl_CFLAGS="$timbl_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"timbl >= 6.4.2 \""; } >&5
- ($PKG_CONFIG --exists --print-errors "timbl >= 6.4.2 ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"timbl >= 6.4.4 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "timbl >= 6.4.4 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_timbl_CFLAGS=`$PKG_CONFIG --cflags "timbl >= 6.4.2 " 2>/dev/null`
+ pkg_cv_timbl_CFLAGS=`$PKG_CONFIG --cflags "timbl >= 6.4.4 " 2>/dev/null`
else
pkg_failed=yes
fi
@@ -16711,12 +16388,12 @@ if test -n "$timbl_LIBS"; then
pkg_cv_timbl_LIBS="$timbl_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"timbl >= 6.4.2 \""; } >&5
- ($PKG_CONFIG --exists --print-errors "timbl >= 6.4.2 ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"timbl >= 6.4.4 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "timbl >= 6.4.4 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_timbl_LIBS=`$PKG_CONFIG --libs "timbl >= 6.4.2 " 2>/dev/null`
+ pkg_cv_timbl_LIBS=`$PKG_CONFIG --libs "timbl >= 6.4.4 " 2>/dev/null`
else
pkg_failed=yes
fi
@@ -16736,14 +16413,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- timbl_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "timbl >= 6.4.2 " 2>&1`
+ timbl_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "timbl >= 6.4.4 " 2>&1`
else
- timbl_PKG_ERRORS=`$PKG_CONFIG --print-errors "timbl >= 6.4.2 " 2>&1`
+ timbl_PKG_ERRORS=`$PKG_CONFIG --print-errors "timbl >= 6.4.4 " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$timbl_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (timbl >= 6.4.2 ) were not met:
+ as_fn_error $? "Package requirements (timbl >= 6.4.4 ) were not met:
$timbl_PKG_ERRORS
@@ -16778,6 +16455,179 @@ fi
CXXFLAGS="$CXXFLAGS $timbl_CFLAGS"
LIBS="$LIBS $timbl_LIBS"
+
+# Check whether --with-ticcutils was given.
+if test "${with_ticcutils+set}" = set; then :
+ withval=$with_ticcutils; PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$withval/lib/pkgconfig"
+else
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$prefix/lib/pkgconfig"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: pkg-config search path: $PKG_CONFIG_PATH " >&5
+$as_echo "$as_me: pkg-config search path: $PKG_CONFIG_PATH " >&6;}
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ticcutils" >&5
+$as_echo_n "checking for ticcutils... " >&6; }
+
+if test -n "$ticcutils_CFLAGS"; then
+ pkg_cv_ticcutils_CFLAGS="$ticcutils_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ticcutils >= 0.4 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ticcutils >= 0.4 ") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_ticcutils_CFLAGS=`$PKG_CONFIG --cflags "ticcutils >= 0.4 " 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$ticcutils_LIBS"; then
+ pkg_cv_ticcutils_LIBS="$ticcutils_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ticcutils >= 0.4 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ticcutils >= 0.4 ") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_ticcutils_LIBS=`$PKG_CONFIG --libs "ticcutils >= 0.4 " 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ ticcutils_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ticcutils >= 0.4 " 2>&1`
+ else
+ ticcutils_PKG_ERRORS=`$PKG_CONFIG --print-errors "ticcutils >= 0.4 " 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ticcutils_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (ticcutils >= 0.4 ) were not met:
+
+$ticcutils_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables ticcutils_CFLAGS
+and ticcutils_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables ticcutils_CFLAGS
+and ticcutils_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ ticcutils_CFLAGS=$pkg_cv_ticcutils_CFLAGS
+ ticcutils_LIBS=$pkg_cv_ticcutils_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+CXXFLAGS="$CXXFLAGS $ticcutils_CFLAGS"
+LIBS="$LIBS $ticcutils_LIBS"
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenMP flag of C++ compiler" >&5
+$as_echo_n "checking for OpenMP flag of C++ compiler... " >&6; }
+if ${ax_cv_cxx_openmp+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ saveCXXFLAGS=$CXXFLAGS
+ax_cv_cxx_openmp=unknown
+# Flags to try: -fopenmp (gcc), -openmp (icc), -mp (SGI & PGI),
+# -xopenmp (Sun), -omp (Tru64), -qsmp=omp (AIX), none
+ax_openmp_flags="-fopenmp -openmp -mp -xopenmp -omp -qsmp=omp none"
+if test "x$OPENMP_CXXFLAGS" != x; then
+ ax_openmp_flags="$OPENMP_CXXFLAGS $ax_openmp_flags"
+fi
+for ax_openmp_flag in $ax_openmp_flags; do
+ case $ax_openmp_flag in
+ none) CXXFLAGS=$saveCXX ;;
+ *) CXXFLAGS="$saveCXXFLAGS $ax_openmp_flag" ;;
+ esac
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char omp_set_num_threads ();
+int
+main ()
+{
+return omp_set_num_threads ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ ax_cv_cxx_openmp=$ax_openmp_flag; break
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+done
+CXXFLAGS=$saveCXXFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_openmp" >&5
+$as_echo "$ax_cv_cxx_openmp" >&6; }
+if test "x$ax_cv_cxx_openmp" = "xunknown"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: We don't seem to have Open MP " >&5
+$as_echo "$as_me: We don't seem to have Open MP " >&6;}
+else
+ if test "x$ax_cv_cxx_openmp" != "xnone"; then
+ OPENMP_CXXFLAGS=$ax_cv_cxx_openmp
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: we have Open MP " >&5
+$as_echo "$as_me: we have Open MP " >&6;}
+ CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
+fi
+
+
+ if test "$OPENMP_CXXFLAGS" != "" ; then
+ WANT_OMP_TRUE=
+ WANT_OMP_FALSE='#'
+else
+ WANT_OMP_TRUE='#'
+ WANT_OMP_FALSE=
+fi
+
+
ac_config_files="$ac_config_files Makefile timblserver.pc m4/Makefile src/Makefile docs/Makefile include/Makefile include/timblserver/Makefile demos/Makefile"
cat >confcache <<\_ACEOF
@@ -17322,7 +17172,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by timblserver $as_me 1.4, which was
+This file was extended by timblserver $as_me 1.7, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17388,7 +17238,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-timblserver config.status 1.4
+timblserver config.status 1.7
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 2e79632..f6ddd77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-# $Id: configure.ac 13735 2011-12-20 15:58:39Z sloot $
+# $Id: configure.ac 15900 2013-04-03 12:30:35Z sloot $
# $URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/configure.ac $
AC_PREREQ(2.61)
-AC_INIT([timblserver],[1.4],[timbl at uvt.nl])
+AC_INIT([timblserver],[1.7],[timbl at uvt.nl])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([.])
AC_CONFIG_MACRO_DIR([m4])
@@ -42,94 +42,22 @@ if test x"$acx_pthread_ok" = xyes; then
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
fi
-AX_OPENMP(
- [AC_MSG_NOTICE( we have Open MP )
- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"],
- [AC_MSG_NOTICE( We don't seem to have Open MP )] )
-
-AM_CONDITIONAL( WANT_OMP, test "$OPENMP_CXXFLAGS" != "" )
-
# Checks for header files.
-AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h sys/socket.h sys/time.h sys/timeb.h unistd.h,fcntl.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/socket.h unistd.h ])
# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STDBOOL
AC_C_INLINE
-AC_C_CONST
-AC_FUNC_FORK
-AC_FUNC_STRFTIME
-AC_HEADER_TIME
-AC_STRUCT_TM
-AC_TYPE_SIGNAL
AC_TYPE_SSIZE_T
AC_TYPE_SIZE_T
AC_TYPE_PID_T
# Checks for library functions.
-AC_FUNC_MALLOC
-AC_CHECK_FUNCS([floor getaddrinfo gethostbyaddr gethostbyname gettimeofday inet_ntoa localtime_r memset pow rint socket sqrt strchr strerror daemon dup2 memmove])
-dnl
-dnl ----- Sockets
-checkBoth=0
-AC_CHECK_FUNC(connect)
-if test "$ac_cv_func_connect" = "no"; then
- AC_CHECK_LIB(socket, main, LIBS="$LIBS -lsocket", checkBoth=1)
-fi
-if test "$checkBoth" = "1"; then
- oldLibs=$LIBS
- LIBS="$LIBS -lsocket -lnsl"
- AC_CHECK_FUNC(accept, , [LIBS=$oldLibs])
-fi
+AC_FUNC_FORK
+AC_CHECK_FUNCS([getaddrinfo gethostbyaddr gethostbyname inet_ntoa memset socket strerror dup2 memmove])
-dnl ------ socklen_t
-dnl We check for socklen_t by making prototypes with the
-dnl various types. First socklen_t, then size_t, finally int.
-dnl If the prototype succeeds, we are probably safe.
-dnl That works if accept is not preprocessor defined (such sa AIX)
-AC_MSG_CHECKING([for socklen_t])
-AC_CACHE_VAL(ac_cv_check_socklen_t,[ac_cv_check_socklen_t=''
- AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define try 1
-#ifdef AIX
-#if AIX >= 51
-#define try 0
-#endif
-#endif
-#if try
-extern int accept(int, struct sockaddr *, socklen_t *);
-#endif
-#ifdef __cplusplus
-}
-#endif
- ],,[ac_cv_check_socklen_t=socklen_t],[
- AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define try 1
-#ifdef AIX
-#if AIX >= 42
-#define try 0
-#endif
-#endif
-#if try
-extern int accept(int, struct sockaddr *, size_t t *);
-#endif
-#ifdef __cplusplus
-}
-#endif
-],,[ac_cv_check_socklen_t=size_t],[ac_cv_check_socklen_t=int])
- ])
- ])
-AC_MSG_RESULT($ac_cv_check_socklen_t)
-AC_DEFINE_UNQUOTED(TIMBL_SOCKLEN_T,$ac_cv_check_socklen_t, "sock_len" )
+AX_LIB_SOCKET_NSL
+AX_TYPE_SOCKLEN_T
# Checks for timbl library.
PKG_PROG_PKG_CONFIG
@@ -146,10 +74,28 @@ AC_ARG_WITH(timbl,
[PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$withval/lib/pkgconfig"],
[PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$prefix/lib/pkgconfig"])
AC_MSG_NOTICE( [pkg-config search path: $PKG_CONFIG_PATH] )
-PKG_CHECK_MODULES([timbl], [timbl >= 6.4.2] )
+PKG_CHECK_MODULES([timbl], [timbl >= 6.4.4] )
CXXFLAGS="$CXXFLAGS $timbl_CFLAGS"
LIBS="$LIBS $timbl_LIBS"
+AC_ARG_WITH(ticcutils,
+ [ --with-ticcutils=DIR use libticcutils installed in <DIR>;
+ note that you can install libticcutils in a non-default directory with
+ ./configure --prefix=<DIR> in the libticutils installation directory],
+ [PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$withval/lib/pkgconfig"],
+ [PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$prefix/lib/pkgconfig"])
+AC_MSG_NOTICE( [pkg-config search path: $PKG_CONFIG_PATH] )
+PKG_CHECK_MODULES([ticcutils], [ticcutils >= 0.4] )
+CXXFLAGS="$CXXFLAGS $ticcutils_CFLAGS"
+LIBS="$LIBS $ticcutils_LIBS"
+
+AX_OPENMP(
+ [AC_MSG_NOTICE( we have Open MP )
+ CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"],
+ [AC_MSG_NOTICE( We don't seem to have Open MP )] )
+
+AM_CONDITIONAL( WANT_OMP, test "$OPENMP_CXXFLAGS" != "" )
+
AC_CONFIG_FILES([
Makefile
timblserver.pc
diff --git a/demos/Makefile.in b/demos/Makefile.in
index d7a141e..ec61c13 100644
--- a/demos/Makefile.in
+++ b/demos/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -43,10 +43,13 @@ subdir = demos
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
- $(top_srcdir)/m4/ax_openmp.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \
+ $(top_srcdir)/m4/ax_openmp.m4 \
+ $(top_srcdir)/m4/ax_type_socklen_t.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -208,6 +211,8 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+ticcutils_CFLAGS = @ticcutils_CFLAGS@
+ticcutils_LIBS = @ticcutils_LIBS@
timbl_CFLAGS = @timbl_CFLAGS@
timbl_LIBS = @timbl_LIBS@
top_build_prefix = @top_build_prefix@
@@ -261,10 +266,10 @@ clean-noinstPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-sockettestClient$(EXEEXT): $(sockettestClient_OBJECTS) $(sockettestClient_DEPENDENCIES)
+sockettestClient$(EXEEXT): $(sockettestClient_OBJECTS) $(sockettestClient_DEPENDENCIES) $(EXTRA_sockettestClient_DEPENDENCIES)
@rm -f sockettestClient$(EXEEXT)
$(CXXLINK) $(sockettestClient_OBJECTS) $(sockettestClient_LDADD) $(LIBS)
-sockettestServer$(EXEEXT): $(sockettestServer_OBJECTS) $(sockettestServer_DEPENDENCIES)
+sockettestServer$(EXEEXT): $(sockettestServer_OBJECTS) $(sockettestServer_DEPENDENCIES) $(EXTRA_sockettestServer_DEPENDENCIES)
@rm -f sockettestServer$(EXEEXT)
$(CXXLINK) $(sockettestServer_OBJECTS) $(sockettestServer_LDADD) $(LIBS)
@@ -400,10 +405,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/demos/sockettestClient.cxx b/demos/sockettestClient.cxx
index 624116a..11b5f6c 100644
--- a/demos/sockettestClient.cxx
+++ b/demos/sockettestClient.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (c) 1998 - 2011
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CNTS - University of Antwerp
@@ -28,7 +28,7 @@
#include <string>
#include <signal.h>
#include <iostream>
-#include "timbl/Types.h"
+#include "ticcutils/StringOps.h"
#include "timblserver/SocketBasics.h"
using namespace std;
@@ -142,7 +142,7 @@ int main( int argc, const char *argv[] ){
if ( argc > 2 )
tos = argv[2];
int timeOut;
- if ( !Timbl::stringTo<int>( tos, timeOut ) ){
+ if ( !TiCC::stringTo<int>( tos, timeOut ) ){
cerr << "invalid timeout" << endl;
cerr << "usage: " << argv[0] << " <port> <timeout>" << endl;
return 1;
diff --git a/demos/sockettestServer.cxx b/demos/sockettestServer.cxx
index 1b35f45..c9f65da 100644
--- a/demos/sockettestServer.cxx
+++ b/demos/sockettestServer.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (c) 1998 - 2011
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CNTS - University of Antwerp
@@ -29,7 +29,7 @@
#include <cstdio>
#include <signal.h>
#include <iostream>
-#include "timbl/Types.h"
+#include "ticcutils/StringOps.h"
#include "timblserver/SocketBasics.h"
using namespace std;
@@ -170,7 +170,7 @@ int main( int argc, const char *argv[] ){
if ( argc > 2 )
tos = argv[2];
int timeOut;
- if ( !Timbl::stringTo<int>( tos, timeOut ) ){
+ if ( !TiCC::stringTo<int>( tos, timeOut ) ){
cerr << "invalid timeout" << endl;
cerr << "usage: " << argv[0] << " <port> <timeout>" << endl;
return 1;
diff --git a/depcomp b/depcomp
index df8eea7..bd0ac08 100755
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-12-04.11; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ Environment variables:
object Object file output by `PROGRAMS ARGS'.
DEPDIR directory where to store dependencies.
depfile Dependency file to output.
- tmpdepfile Temporary file to use when outputing dependencies.
+ tmpdepfile Temporary file to use when outputting dependencies.
libtool Whether libtool is used (yes/no).
Report bugs to <bug-automake at gnu.org>.
@@ -90,10 +90,18 @@ if test "$depmode" = msvcmsys; then
# This is just like msvisualcpp but w/o cygpath translation.
# Just convert the backslash-escaped backslashes to single forward
# slashes to satisfy depend.m4
- cygpath_u="sed s,\\\\\\\\,/,g"
+ cygpath_u='sed s,\\\\,/,g'
depmode=msvisualcpp
fi
+if test "$depmode" = msvc7msys; then
+ # This is just like msvc7 but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvc7
+fi
+
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
@@ -158,10 +166,12 @@ gcc)
' < "$tmpdepfile" |
## Some versions of gcc put a space before the `:'. On the theory
## that the space means something, we add a space to the output as
-## well.
+## well. hp depmode also adds that space, but also prefixes the VPATH
+## to the object. Take care to not repeat it in the output.
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+ | sed -e 's/$/ :/' >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -405,6 +415,52 @@ tru64)
rm -f "$tmpdepfile"
;;
+msvc7)
+ if test "$libtool" = yes; then
+ showIncludes=-Wc,-showIncludes
+ else
+ showIncludes=-showIncludes
+ fi
+ "$@" $showIncludes > "$tmpdepfile"
+ stat=$?
+ grep -v '^Note: including file: ' "$tmpdepfile"
+ if test "$stat" = 0; then :
+ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ # The first sed program below extracts the file names and escapes
+ # backslashes for cygpath. The second sed program outputs the file
+ # name when reading, but also accumulates all include files in the
+ # hold buffer in order to output them again at the end. This only
+ # works with sed implementations that can handle large buffers.
+ sed < "$tmpdepfile" -n '
+/^Note: including file: *\(.*\)/ {
+ s//\1/
+ s/\\/\\\\/g
+ p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/ \1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+ s/.*/ /
+ G
+ p
+}' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+msvc7msys)
+ # This case exists only to let depend.m4 do its work. It works by
+ # looking at the text of this script. This case will never be run,
+ # since it is checked for above.
+ exit 1
+ ;;
+
#nosideeffect)
# This comment above is used by automake to tell side-effect
# dependency tracking mechanisms from slower ones.
@@ -503,7 +559,9 @@ makedepend)
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
+ # makedepend may prepend the VPATH from the source file name to the object.
+ # No need to regex-escape $object, excess matching of '.' is harmless.
+ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
sed '1,2d' "$tmpdepfile" | tr ' ' '
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 67adafa..80612a9 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -40,10 +40,13 @@ subdir = docs
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
- $(top_srcdir)/m4/ax_openmp.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \
+ $(top_srcdir)/m4/ax_openmp.m4 \
+ $(top_srcdir)/m4/ax_type_socklen_t.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -73,6 +76,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
man1dir = $(mandir)/man1
am__installdirs = "$(DESTDIR)$(man1dir)"
NROFF = nroff
@@ -201,6 +210,8 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+ticcutils_CFLAGS = @ticcutils_CFLAGS@
+ticcutils_LIBS = @ticcutils_LIBS@
timbl_CFLAGS = @timbl_CFLAGS@
timbl_LIBS = @timbl_LIBS@
top_build_prefix = @top_build_prefix@
@@ -278,9 +289,7 @@ uninstall-man1:
files=`{ for i in $$list; do echo "$$i"; done; \
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
- test -z "$$files" || { \
- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -348,10 +357,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/docs/timblserver.1 b/docs/timblserver.1
index 1c671a2..a62b1d0 100644
--- a/docs/timblserver.1
+++ b/docs/timblserver.1
@@ -9,7 +9,7 @@ timblserver --config=configfile [--pidfile=pfile] [--logfile=lfile] [--daemonize
.SH DESCRIPTION
timblserver extends
-.B simbl
+.B timbl
with a server layer. It provides the possibility to access one timbl instance
from multiple sessions. It also allows running and accessing different timbl
instances in parallel.
@@ -27,13 +27,13 @@ read server settings from file
.BR --pidfile =file
.RS
-store the pid of the main server process in file
+store the pid of the main server process in 'file'. A full path must me given for 'file' otherwise the file will end up in '/'.
.RE
.BR --logfile =file
.RS
-log server actions to file
+log server actions to 'file'. A full path must me given for 'file' otherwise the file will end up in '/'.
.RE
.BR --daemonize =[yes|no]
diff --git a/include/Makefile.in b/include/Makefile.in
index 990de2b..c9a8957 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -40,10 +40,13 @@ subdir = include
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
- $(top_srcdir)/m4/ax_openmp.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \
+ $(top_srcdir)/m4/ax_openmp.m4 \
+ $(top_srcdir)/m4/ax_type_socklen_t.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -216,6 +219,8 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+ticcutils_CFLAGS = @ticcutils_CFLAGS@
+ticcutils_LIBS = @ticcutils_LIBS@
timbl_CFLAGS = @timbl_CFLAGS@
timbl_LIBS = @timbl_LIBS@
top_build_prefix = @top_build_prefix@
@@ -471,10 +476,15 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/include/timblserver/ClientBase.h b/include/timblserver/ClientBase.h
index e0cd097..2e0246b 100644
--- a/include/timblserver/ClientBase.h
+++ b/include/timblserver/ClientBase.h
@@ -1,8 +1,8 @@
/*
- $Id: ClientBase.h 12589 2011-07-19 12:52:06Z sloot $
+ $Id: ClientBase.h 15566 2013-01-07 14:44:02Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/include/timblserver/ClientBase.h $
- Copyright (c) 1998 - 2011
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
@@ -31,7 +31,7 @@
#define CLIENTBASE_H
#include "timbl/TimblAPI.h"
-#include "timbl/LogStream.h"
+#include "ticcutils/LogStream.h"
#include "timblserver/SocketBasics.h"
namespace TimblServer {
diff --git a/include/timblserver/FdStream.h b/include/timblserver/FdStream.h
index 100fe69..5e30ac6 100644
--- a/include/timblserver/FdStream.h
+++ b/include/timblserver/FdStream.h
@@ -1,8 +1,8 @@
/*
- $Id: FdStream.h 9195 2011-03-29 08:35:23Z sloot $
+ $Id: FdStream.h 15566 2013-01-07 14:44:02Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/include/timblserver/FdStream.h $
- Copyright (c) 1998 - 2011
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/include/timblserver/Makefile.in b/include/timblserver/Makefile.in
index 2aad0ee..db399db 100644
--- a/include/timblserver/Makefile.in
+++ b/include/timblserver/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -42,10 +42,13 @@ DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
- $(top_srcdir)/m4/ax_openmp.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \
+ $(top_srcdir)/m4/ax_openmp.m4 \
+ $(top_srcdir)/m4/ax_type_socklen_t.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -75,6 +78,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgincludedir)"
HEADERS = $(pkginclude_HEADERS)
ETAGS = etags
@@ -203,6 +212,8 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+ticcutils_CFLAGS = @ticcutils_CFLAGS@
+ticcutils_LIBS = @ticcutils_LIBS@
timbl_CFLAGS = @timbl_CFLAGS@
timbl_LIBS = @timbl_LIBS@
top_build_prefix = @top_build_prefix@
@@ -267,9 +278,7 @@ uninstall-pkgincludeHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
+ dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -370,10 +379,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/include/timblserver/ServerBase.h b/include/timblserver/ServerBase.h
index c968757..aab0aae 100644
--- a/include/timblserver/ServerBase.h
+++ b/include/timblserver/ServerBase.h
@@ -1,8 +1,8 @@
/*
- $Id: ServerBase.h 12552 2011-07-18 10:47:45Z sloot $
+ $Id: ServerBase.h 15566 2013-01-07 14:44:02Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/include/timblserver/ServerBase.h $
- Copyright (c) 1998 - 2011
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
@@ -31,7 +31,7 @@
#define SERVERBASE_H
#include "timbl/TimblAPI.h"
-#include "timbl/LogStream.h"
+#include "ticcutils/LogStream.h"
#include "timblserver/SocketBasics.h"
namespace TimblServer {
@@ -41,7 +41,7 @@ namespace TimblServer {
friend ServerClass *CreateServerPimpl( Timbl::AlgorithmType,
Timbl::GetOptClass * );
public:
- LogStream myLog;
+ TiCC::LogStream myLog;
bool doDebug() { return debug; };
bool doSetOptions( Timbl::TimblExperiment *, const std::string& );
bool classifyOneLine( Timbl::TimblExperiment *, const std::string& );
diff --git a/include/timblserver/SocketBasics.h b/include/timblserver/SocketBasics.h
index 9418979..4aa1505 100644
--- a/include/timblserver/SocketBasics.h
+++ b/include/timblserver/SocketBasics.h
@@ -1,8 +1,8 @@
/*
- $Id: SocketBasics.h 9329 2011-04-07 13:03:44Z sloot $
+ $Id: SocketBasics.h 15566 2013-01-07 14:44:02Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/include/timblserver/SocketBasics.h $
- Copyright (c) 1998 - 2011
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/include/timblserver/TimblServerAPI.h b/include/timblserver/TimblServerAPI.h
index 39c0baa..994c213 100644
--- a/include/timblserver/TimblServerAPI.h
+++ b/include/timblserver/TimblServerAPI.h
@@ -1,8 +1,8 @@
/*
- $Id: TimblServerAPI.h 9351 2011-04-07 14:47:29Z sloot $
+ $Id: TimblServerAPI.h 15566 2013-01-07 14:44:02Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/include/timblserver/TimblServerAPI.h $
- Copyright (c) 1998 - 2011
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/ltmain.sh b/ltmain.sh
old mode 100755
new mode 100644
index b4a3231..c2852d8
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,9 @@
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -41,6 +41,7 @@
# --quiet, --silent don't print informational messages
# --no-quiet, --no-silent
# print informational messages (default)
+# --no-warn don't display warning messages
# --tag=TAG use configuration variables from tag TAG
# -v, --verbose print more informational messages than default
# --no-verbose don't print the extra informational messages
@@ -69,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -79,9 +80,9 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4 Debian-2.4-2ubuntu1"
+VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@ progpath="$0"
: ${CP="cp -f"}
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="/bin/sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
@@ -387,7 +383,7 @@ case $progpath in
;;
*)
save_IFS="$IFS"
- IFS=:
+ IFS=${PATH_SEPARATOR-:}
for progdir in $PATH; do
IFS="$save_IFS"
test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@ func_help ()
s*\$LTCFLAGS*'"$LTCFLAGS"'*
s*\$LD*'"$LD"'*
s/\$with_gnu_ld/'"$with_gnu_ld"'/
- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+ s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+ s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
p
d
}
@@ -1052,6 +1048,7 @@ opt_finish=false
opt_help=false
opt_help_all=false
opt_silent=:
+opt_warning=:
opt_verbose=:
opt_silent=false
opt_verbose=false
@@ -1120,6 +1117,10 @@ esac
opt_silent=false
func_append preserve_args " $opt"
;;
+ --no-warning|--no-warn)
+ opt_warning=false
+func_append preserve_args " $opt"
+ ;;
--no-verbose)
opt_verbose=false
func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+ *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@ -3201,11 +3202,13 @@ func_mode_install ()
# Set up the ranlib parameters.
oldlib="$destdir/$name"
+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+ tool_oldlib=$func_to_tool_file_result
func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
if test -n "$stripme" && test -n "$old_striplib"; then
- func_show_eval "$old_striplib $oldlib" 'exit $?'
+ func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
fi
# Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() {
# linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
@@ -3982,14 +3985,17 @@ func_exec_program_core ()
# launches target application with the remaining arguments.
func_exec_program ()
{
- for lt_wr_arg
- do
- case \$lt_wr_arg in
- --lt-*) ;;
- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
- esac
- shift
- done
+ case \" \$* \" in
+ *\\ --lt-*)
+ for lt_wr_arg
+ do
+ case \$lt_wr_arg in
+ --lt-*) ;;
+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+ esac
+ shift
+ done ;;
+ esac
func_exec_program_core \${1+\"\$@\"}
}
@@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f)
{
EOF
func_emit_wrapper yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
-
+ $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/ fputs ("\1", f);/p
+g
+D'
cat <<"EOF"
}
EOF
@@ -5643,7 +5655,8 @@ func_mode_link ()
continue
;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -6150,7 +6163,8 @@ func_mode_link ()
lib=
found=no
case $deplib in
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
@@ -6834,7 +6848,7 @@ func_mode_link ()
test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$dir"
+ add_dir="-L$absdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -7319,6 +7333,7 @@ func_mode_link ()
# which has an extra 1 added just for fun
#
case $version_type in
+ # correct linux to gnu/linux during the next big refactor
darwin|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
@@ -7438,7 +7453,7 @@ func_mode_link ()
versuffix="$major.$revision"
;;
- linux)
+ linux) # correct to gnu/linux during the next big refactor
func_arith $current - $age
major=.$func_arith_result
versuffix="$major.$age.$revision"
@@ -8026,6 +8041,11 @@ EOF
# Test again, we may have decided not to build it any more
if test "$build_libtool_libs" = yes; then
+ # Remove ${wl} instances when linking with ld.
+ # FIXME: should test the right _cmds variable.
+ case $archive_cmds in
+ *\$LD\ *) wl= ;;
+ esac
if test "$hardcode_into_libs" = yes; then
# Hardcode the library paths
hardcode_libdirs=
@@ -8056,7 +8076,7 @@ EOF
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) func_apped perm_rpath " $libdir" ;;
+ *) func_append perm_rpath " $libdir" ;;
esac
fi
done
@@ -8064,11 +8084,7 @@ EOF
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
- if test -n "$hardcode_libdir_flag_spec_ld"; then
- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
- else
- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
- fi
+ eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
fi
if test -n "$runpath_var" && test -n "$perm_rpath"; then
# We should set the runpath_var.
@@ -9158,6 +9174,8 @@ EOF
esac
done
fi
+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+ tool_oldlib=$func_to_tool_file_result
eval cmds=\"$old_archive_cmds\"
func_len " $cmds"
@@ -9267,7 +9285,8 @@ EOF
*.la)
func_basename "$deplib"
name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ func_resolve_sysroot "$deplib"
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 171f6c7..c3f1b2c 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -40,10 +40,13 @@ subdir = m4
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
- $(top_srcdir)/m4/ax_openmp.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \
+ $(top_srcdir)/m4/ax_openmp.m4 \
+ $(top_srcdir)/m4/ax_type_socklen_t.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -176,6 +179,8 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+ticcutils_CFLAGS = @ticcutils_CFLAGS@
+ticcutils_LIBS = @ticcutils_LIBS@
timbl_CFLAGS = @timbl_CFLAGS@
timbl_LIBS = @timbl_LIBS@
top_build_prefix = @top_build_prefix@
@@ -272,10 +277,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/m4/ax_lib_socket_nsl.m4 b/m4/ax_lib_socket_nsl.m4
new file mode 100644
index 0000000..058e975
--- /dev/null
+++ b/m4/ax_lib_socket_nsl.m4
@@ -0,0 +1,40 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_lib_socket_nsl.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_LIB_SOCKET_NSL
+#
+# DESCRIPTION
+#
+# This macro figures out what libraries are required on this platform to
+# link sockets programs.
+#
+# The common cases are not to need any extra libraries, or to need
+# -lsocket and -lnsl. We need to avoid linking with libnsl unless we need
+# it, though, since on some OSes where it isn't necessary it will totally
+# break networking. Unisys also includes gethostbyname() in libsocket but
+# needs libnsl for socket().
+#
+# LICENSE
+#
+# Copyright (c) 2008 Russ Allbery <rra at stanford.edu>
+# Copyright (c) 2008 Stepan Kasal <kasal at ucw.cz>
+# Copyright (c) 2008 Warren Young <warren at etr-usa.com>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 6
+
+AU_ALIAS([LIB_SOCKET_NSL], [AX_LIB_SOCKET_NSL])
+AC_DEFUN([AX_LIB_SOCKET_NSL],
+[
+ AC_SEARCH_LIBS([gethostbyname], [nsl])
+ AC_SEARCH_LIBS([socket], [socket], [], [
+ AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"],
+ [], [-lnsl])])
+])
diff --git a/m4/ax_type_socklen_t.m4 b/m4/ax_type_socklen_t.m4
new file mode 100644
index 0000000..834c4cf
--- /dev/null
+++ b/m4/ax_type_socklen_t.m4
@@ -0,0 +1,61 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_type_socklen_t.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_TYPE_SOCKLEN_T
+#
+# DESCRIPTION
+#
+# Check whether sys/socket.h defines type socklen_t. Please note that some
+# systems require sys/types.h to be included before sys/socket.h can be
+# compiled.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Lars Brinkhoff <lars at nocrew.org>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Archive. When you make and distribute a
+# modified version of the Autoconf Macro, you may extend this special
+# exception to the GPL to apply to your modified version as well.
+
+#serial 5
+
+AU_ALIAS([TYPE_SOCKLEN_T], [AX_TYPE_SOCKLEN_T])
+AC_DEFUN([AX_TYPE_SOCKLEN_T],
+[AC_CACHE_CHECK([for socklen_t], ac_cv_ax_type_socklen_t,
+[
+ AC_TRY_COMPILE(
+ [#include <sys/types.h>
+ #include <sys/socket.h>],
+ [socklen_t len = 42; return 0;],
+ ac_cv_ax_type_socklen_t=yes,
+ ac_cv_ax_type_socklen_t=no)
+])
+ if test $ac_cv_ax_type_socklen_t != yes; then
+ AC_DEFINE(socklen_t, int, [Substitute for socklen_t])
+ fi
+])
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
index 9c7b5d4..07a8602 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -9,15 +9,15 @@
# @configure_input@
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff --git a/missing b/missing
index 28055d2..86a8fc3 100755
--- a/missing
+++ b/missing
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@ Supported PROGRAM values:
help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@ case $1 in
# Not GNU programs, they don't have --version.
;;
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
@@ -226,7 +216,7 @@ WARNING: \`$1' $msg. You should only need it if
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@ WARNING: \`$1' is $msg. You should only need it if
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@ WARNING: \`$1' is $msg. You should only need it if
touch $file
;;
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and is $msg.
diff --git a/src/ClientBase.cxx b/src/ClientBase.cxx
index dc14c00..823faaf 100644
--- a/src/ClientBase.cxx
+++ b/src/ClientBase.cxx
@@ -1,8 +1,8 @@
/*
- $Id: ClientBase.cxx 12589 2011-07-19 12:52:06Z sloot $
+ $Id: ClientBase.cxx 15829 2013-03-28 11:56:41Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/src/ClientBase.cxx $
- Copyright (c) 1998 - 2011
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
@@ -32,6 +32,7 @@
#include <cstdlib>
#include <csignal>
#include "timbl/TimblAPI.h"
+#include "ticcutils/StringOps.h"
#include "timblserver/FdStream.h"
#include "timblserver/ClientBase.h"
@@ -58,10 +59,10 @@ namespace TimblServer {
string names = line.substr( 17 );
// cerr << "step 1 '" << names << "'" << endl;
vector<string> name;
- if ( Timbl::split_at( names, name, " " ) > 0 ){
+ if ( TiCC::split_at( names, name, " " ) > 0 ){
for ( size_t i=0; i < name.size(); ++i ){
// cerr << "step 2 i= " << i << " '" << name[i] << "'" << endl;
- bases.insert( Timbl::compress(name[i]) );
+ bases.insert( TiCC::trim(name[i]) );
}
return true;
}
@@ -75,7 +76,7 @@ namespace TimblServer {
<< port << endl;
string line;
if ( client.connect( node, port) ){
- serverPort = Timbl::stringTo<int>( port );
+ serverPort = TiCC::stringTo<int>( port );
serverName = node;
if ( client.read( line ) ){
// cout << "read line " << line << endl;
diff --git a/src/FdStream.cxx b/src/FdStream.cxx
index 45f7f3e..9d4de30 100644
--- a/src/FdStream.cxx
+++ b/src/FdStream.cxx
@@ -1,8 +1,8 @@
/*
- $Id: FdStream.cxx 13735 2011-12-20 15:58:39Z sloot $
+ $Id: FdStream.cxx 15566 2013-01-07 14:44:02Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/src/FdStream.cxx $
- Copyright (c) 1998 - 2011
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/src/Makefile.am b/src/Makefile.am
index 1d21429..a4c0327 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 12560 2011-07-18 15:13:16Z sloot $
+# $Id: Makefile.am 15922 2013-04-03 15:48:53Z sloot $
# $URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/src/Makefile.am $
AM_CPPFLAGS = -I at top_srcdir@/include
@@ -11,7 +11,7 @@ timblclient_SOURCES = TimblClient.cxx
timblserver_SOURCES = TimblServer.cxx
lib_LTLIBRARIES = libtimblserver.la
-libtimblserver_la_LDFLAGS= -version-info 2:0:0
+libtimblserver_la_LDFLAGS= -version-info 3:0:0
libtimblserver_la_SOURCES = FdStream.cxx SocketBasics.cxx \
ServerBase.cxx ClientBase.cxx TimblServerAPI.cxx
diff --git a/src/Makefile.in b/src/Makefile.in
index 6aac8f6..d026e34 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@
@SET_MAKE@
-# $Id: Makefile.am 12560 2011-07-18 15:13:16Z sloot $
+# $Id: Makefile.am 15922 2013-04-03 15:48:53Z sloot $
# $URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/src/Makefile.am $
@@ -43,10 +43,13 @@ subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
- $(top_srcdir)/m4/ax_openmp.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \
+ $(top_srcdir)/m4/ax_openmp.m4 \
+ $(top_srcdir)/m4/ax_type_socklen_t.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -74,6 +77,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
libtimblserver_la_LIBADD =
@@ -235,6 +244,8 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+ticcutils_CFLAGS = @ticcutils_CFLAGS@
+ticcutils_LIBS = @ticcutils_LIBS@
timbl_CFLAGS = @timbl_CFLAGS@
timbl_LIBS = @timbl_LIBS@
top_build_prefix = @top_build_prefix@
@@ -245,7 +256,7 @@ LDADD = libtimblserver.la
timblclient_SOURCES = TimblClient.cxx
timblserver_SOURCES = TimblServer.cxx
lib_LTLIBRARIES = libtimblserver.la
-libtimblserver_la_LDFLAGS = -version-info 2:0:0
+libtimblserver_la_LDFLAGS = -version-info 3:0:0
libtimblserver_la_SOURCES = FdStream.cxx SocketBasics.cxx \
ServerBase.cxx ClientBase.cxx TimblServerAPI.cxx
@@ -314,7 +325,7 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libtimblserver.la: $(libtimblserver_la_OBJECTS) $(libtimblserver_la_DEPENDENCIES)
+libtimblserver.la: $(libtimblserver_la_OBJECTS) $(libtimblserver_la_DEPENDENCIES) $(EXTRA_libtimblserver_la_DEPENDENCIES)
$(libtimblserver_la_LINK) -rpath $(libdir) $(libtimblserver_la_OBJECTS) $(libtimblserver_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -359,10 +370,10 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-timblclient$(EXEEXT): $(timblclient_OBJECTS) $(timblclient_DEPENDENCIES)
+timblclient$(EXEEXT): $(timblclient_OBJECTS) $(timblclient_DEPENDENCIES) $(EXTRA_timblclient_DEPENDENCIES)
@rm -f timblclient$(EXEEXT)
$(CXXLINK) $(timblclient_OBJECTS) $(timblclient_LDADD) $(LIBS)
-timblserver$(EXEEXT): $(timblserver_OBJECTS) $(timblserver_DEPENDENCIES)
+timblserver$(EXEEXT): $(timblserver_OBJECTS) $(timblserver_DEPENDENCIES) $(EXTRA_timblserver_DEPENDENCIES)
@rm -f timblserver$(EXEEXT)
$(CXXLINK) $(timblserver_OBJECTS) $(timblserver_LDADD) $(LIBS)
@@ -508,10 +519,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
diff --git a/src/ServerBase.cxx b/src/ServerBase.cxx
index 28fe40a..2d537e4 100644
--- a/src/ServerBase.cxx
+++ b/src/ServerBase.cxx
@@ -1,8 +1,8 @@
/*
- $Id: ServerBase.cxx 13726 2011-12-20 11:12:52Z sloot $
+ $Id: ServerBase.cxx 15874 2013-04-02 15:46:31Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/src/ServerBase.cxx $
- Copyright (c) 1998 - 2011
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
@@ -40,8 +40,10 @@
#include "config.h"
#include "timblserver/FdStream.h"
#include "timblserver/ServerBase.h"
+#include "ticcutils/Timer.h"
using namespace std;
+using namespace TiCC;
using namespace Timbl;
namespace TimblServer {
@@ -388,7 +390,7 @@ namespace TimblServer {
string baseName;
*os << "Welcome to the Timbl server." << endl;
if ( args->experiments->empty() ){
- baseName == "default";
+ baseName = "default";
*Dbg(theServer->myLog) << " Voor Create Default Client " << endl;
Chld = createClient( theServer->theExp(), sock );
*Dbg(theServer->myLog) << " Na Create Client " << endl;
@@ -535,7 +537,7 @@ namespace TimblServer {
void ServerClass::RunClassicServer(){
if ( !pidFile.empty() ){
// check validity of pidfile
- if ( pidFile[0] != '/' ) // make sure the path is absolute
+ if ( doDaemon && pidFile[0] != '/' ) // make sure the path is absolute
pidFile = '/' + pidFile;
unlink( pidFile.c_str() ) ;
ofstream pid_file( pidFile.c_str() ) ;
@@ -547,7 +549,7 @@ namespace TimblServer {
}
ostream *logS = 0;
if ( !logFile.empty() ){
- if ( logFile[0] != '/' ) // make sure the path is absolute
+ if ( doDaemon && logFile[0] != '/' ) // make sure the path is absolute
logFile = '/' + logFile;
logS = new ofstream( logFile.c_str() );
if ( logS && logS->good() ){
@@ -821,11 +823,11 @@ namespace TimblServer {
while ( it != range.second ){
if ( it->second == "settings" ){
xmlNode *tmp = api->settingsToXML();
- XmlAddChild( root, tmp );
+ xmlAddChild( root, tmp );
}
else if ( it->second == "weights" ){
xmlNode *tmp = api->weightsToXML();
- XmlAddChild( root, tmp );
+ xmlAddChild( root, tmp );
}
else
LS << "don't know how to SHOW: "
@@ -868,18 +870,18 @@ namespace TimblServer {
<< endl;
xmlNode *cl = XmlNewChild( root, "classification" );
- XmlNewChild( cl, "input", params );
- XmlNewChild( cl, "category", answer );
+ XmlNewTextChild( cl, "input", params );
+ XmlNewTextChild( cl, "category", answer );
if ( api->Verbosity(DISTRIB) ){
- XmlNewChild( cl, "distribution", distrib );
+ XmlNewTextChild( cl, "distribution", distrib );
}
if ( api->Verbosity(DISTANCE) ){
- XmlNewChild( cl, "distance",
+ XmlNewTextChild( cl, "distance",
toString<double>(distance) );
}
if ( api->Verbosity(NEAR_N) ){
xmlNode *nb = api->bestNeighborsToXML();
- XmlAddChild( cl, nb );
+ xmlAddChild( cl, nb );
}
}
else {
diff --git a/src/SocketBasics.cxx b/src/SocketBasics.cxx
index 9f2b779..630bc48 100755
--- a/src/SocketBasics.cxx
+++ b/src/SocketBasics.cxx
@@ -1,8 +1,8 @@
/*
- $Id: SocketBasics.cxx 13735 2011-12-20 15:58:39Z sloot $
+ $Id: SocketBasics.cxx 15829 2013-03-28 11:56:41Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/src/SocketBasics.cxx $
- Copyright (c) 1998 - 2011
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
@@ -38,13 +38,14 @@
#include <climits>
#include <fcntl.h>
-#include "timbl/Types.h"
+//#include "timbl/Types.h"
#include "config.h"
#include "timblserver/SocketBasics.h"
+#include "ticcutils/StringOps.h"
using namespace std;
-using namespace Timbl;
+//using namespace Timbl;
namespace Sockets {
@@ -168,8 +169,8 @@ namespace Sockets {
str += this_write;
}
if ( bytes_sent < count ) {
- mess = "write: failed to sent " + Timbl::toString(count - bytes_sent) +
- " bytes out of " + Timbl::toString(count);
+ mess = "write: failed to sent " + TiCC::toString(count - bytes_sent) +
+ " bytes out of " + TiCC::toString(count);
return false;
}
}
@@ -204,8 +205,8 @@ namespace Sockets {
}
}
if ( bytes_sent < count ) {
- mess = "write: failed to sent " + Timbl::toString(count - bytes_sent) +
- " bytes out of " + Timbl::toString(count);
+ mess = "write: failed to sent " + TiCC::toString(count - bytes_sent) +
+ " bytes out of " + TiCC::toString(count);
return false;
}
}
@@ -215,7 +216,7 @@ namespace Sockets {
string Socket::getMessage() const{
string m;
if ( isValid() )
- m = "socket " + Timbl::toString(sock);
+ m = "socket " + TiCC::toString(sock);
else
m = "invalid socket ";
if ( !mess.empty() )
@@ -324,8 +325,9 @@ namespace Sockets {
setsockopt( sock, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof(val) );
if ( ::connect( sock, aip->ai_addr, aip->ai_addrlen ) < 0 ){
close( sock );
+ sock = -1;
mess = string( "ClientSocket: Connection on ") + hostString + ":"
- + Timbl::toString(sock) + " failed (" + strerror(errno) + ")";
+ + TiCC::toString(sock) + " failed (" + strerror(errno) + ")";
}
}
freeaddrinfo( res ); // and delete all addr_info stuff
@@ -377,7 +379,7 @@ namespace Sockets {
bool ServerSocket::accept( ServerSocket& newSocket ){
newSocket.sock = -1;
struct sockaddr_storage cli_addr;
- TIMBL_SOCKLEN_T clilen = sizeof(cli_addr);
+ socklen_t clilen = sizeof(cli_addr);
int newsock = ::accept( sock, (struct sockaddr *)&cli_addr, &clilen );
if( newsock < 0 ){
if ( errno == EINTR )
@@ -501,7 +503,7 @@ namespace Sockets {
bool ServerSocket::accept( ServerSocket& newSocket ){
newSocket.sock = -1;
struct sockaddr_storage cli_addr;
- TIMBL_SOCKLEN_T clilen = sizeof(cli_addr);
+ socklen_t clilen = sizeof(cli_addr);
int newsock = ::accept( sock, (struct sockaddr *)&cli_addr, &clilen );
if( newsock < 0 ){
if ( errno == EINTR )
@@ -513,7 +515,7 @@ namespace Sockets {
else {
string clientname;
struct sockaddr_in rem;
- TIMBL_SOCKLEN_T remlen = sizeof(rem);
+ socklen_t remlen = sizeof(rem);
if ( getpeername( newsock, (struct sockaddr *)&rem, &remlen ) >= 0 ){
struct hostent *host = gethostbyaddr( (char *)&rem.sin_addr,
sizeof rem.sin_addr,
diff --git a/src/TimblClient.cxx b/src/TimblClient.cxx
index f13e563..9842623 100644
--- a/src/TimblClient.cxx
+++ b/src/TimblClient.cxx
@@ -1,8 +1,8 @@
/*
- $Id: TimblClient.cxx 12586 2011-07-19 12:39:23Z sloot $
+ $Id: TimblClient.cxx 15566 2013-01-07 14:44:02Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/src/TimblClient.cxx $
- Copyright (c) 1998 - 2011
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/src/TimblServer.cxx b/src/TimblServer.cxx
index ce87540..764dcff 100644
--- a/src/TimblServer.cxx
+++ b/src/TimblServer.cxx
@@ -1,8 +1,8 @@
/*
- $Id: TimblServer.cxx 9351 2011-04-07 14:47:29Z sloot $
+ $Id: TimblServer.cxx 15829 2013-03-28 11:56:41Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/src/TimblServer.cxx $
- Copyright (c) 1998 - 2011
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
@@ -190,7 +190,7 @@ void Preset_Values( TimblOpts& Opts ){
}
else {
Do_Server = true;
- ServerPort = stringTo<int>( value );
+ ServerPort = TiCC::stringTo<int>( value );
if ( ServerPort < 1 || ServerPort > 100000 ){
cerr << "-S option, portnumber invalid: " << ServerPort << endl;
throw( softExit() );
@@ -212,7 +212,7 @@ void Preset_Values( TimblOpts& Opts ){
cerr << "-C option invalid without -S" << endl;
throw( softExit() );
}
- Max_Connections = stringTo<int>( value );
+ Max_Connections = TiCC::stringTo<int>( value );
if ( Max_Connections < 1 || Max_Connections > 1000 ){
cerr << "-C options, max number of connection invalid: "
<< Max_Connections << endl;
@@ -287,7 +287,7 @@ bool get_file_names( TimblOpts& Opts ){
if ( !string_to( value, W ) ){
// No valid weighting, so assume it also has a filename
vector<string> parts;
- size_t num = split_at( value, parts, ":" );
+ size_t num = TiCC::split_at( value, parts, ":" );
if ( num == 2 ){
if ( !string_to( parts[1], W ) ){
cerr << "invalid weighting option: " << value << endl;
@@ -328,7 +328,7 @@ int main(int argc, char *argv[]){
// Start.
//
cerr << "TiMBL Server " << TimblServer::Version()
- << " (c) ILK 1998 - 2011.\n"
+ << " (c) ILK 1998 - 2013.\n"
<< "Tilburg Memory Based Learner\n"
<< "Induction of Linguistic Knowledge Research Group, Tilburg University\n"
<< "CLiPS Computational Linguistics Group, University of Antwerp\n"
diff --git a/src/TimblServerAPI.cxx b/src/TimblServerAPI.cxx
index 3ebd757..6e7e0e3 100644
--- a/src/TimblServerAPI.cxx
+++ b/src/TimblServerAPI.cxx
@@ -1,8 +1,8 @@
/*
- $Id: TimblServerAPI.cxx 9351 2011-04-07 14:47:29Z sloot $
+ $Id: TimblServerAPI.cxx 15566 2013-01-07 14:44:02Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/TimblServer/src/TimblServerAPI.cxx $
- Copyright (c) 1998 - 2011
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/timblserver.git
More information about the debian-science-commits
mailing list