fixed includes. much less dependencies

git-svn-id: https://ilk.uvt.nl/svn/trunk/sources/MbtServer@18748 12f355fe-0486-481a-ad91-c297ab22b4e3

.travis.yml

@@ -12,20 +12,6 @@ before_install:
     - make
     - sudo make install
     - cd ..
-    - git clone https://github.com/proycon/timbl
-    - cd timbl
-    - bash bootstrap.sh
-    - ./configure
-    - make
-    - sudo make install
-    - cd ..
-    - git clone https://github.com/proycon/timblserver
-    - cd timblserver
-    - bash bootstrap.sh
-    - ./configure
-    - make
-    - sudo make install
-    - cd ..
     - git clone https://github.com/proycon/mbt
     - cd mbt
     - bash bootstrap.sh

configure.ac

@@ -70,16 +70,6 @@ PKG_CHECK_MODULES([timbl], [timbl >= 6.4.4] )
 CXXFLAGS="$CXXFLAGS $timbl_CFLAGS"
 LIBS="$LIBS $timbl_LIBS"
 
-AC_ARG_WITH(timblserver,
-       [  --with-timblserver=DIR       use timblserver installed in <DIR>;
-               note that you can install timbl in a non-default directory with
-               ./configure --prefix=<DIR> in the timbl installation directory],
-       [PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$withval/lib/pkgconfig"])
-#  AC_MSG_NOTICE( [pkg-config search path: $PKG_CONFIG_PATH] )
-PKG_CHECK_MODULES([timblserver], [timblserver >= 1.10] )
-CXXFLAGS="$CXXFLAGS $timblserver_CFLAGS"
-LIBS="$LIBS $timblserver_LIBS"
-
 AC_ARG_WITH(mbt,
        [  --with-mbt=DIR       use mbt installed in <DIR>;
                note that you can install mbt in a non-default directory with

include/mbtserver/MbtServerBase.h

@@ -30,8 +30,8 @@
 #define MBTSERVER_H
 
 #include "mbt/MbtAPI.h"
-#include "timblserver/FdStream.h"
-#include "timblserver/ServerBase.h"
+#include "ticcutils/FdStream.h"
+#include "ticcutils/ServerBase.h"
 
 namespace MbtServer {
   using namespace TimblServer;