diff --git a/.travis.yml b/.travis.yml
index 935b81f..b597681 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,13 @@ 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/mbt
- cd mbt
- bash bootstrap.sh
diff --git a/configure.ac b/configure.ac
index 6bb7084..9495dfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,13 +59,24 @@ PKG_PROG_PKG_CONFIG
if test "x$PKG_CONFIG_PATH" = x; then
export PKG_CONFIG_PATH=""
fi
+
+AC_ARG_WITH(ticcutils,
+ [ --with-ticcutils=DIR use ticcutils installed in
;
+ note that you can install ticcutils in a non-default directory with
+ ./configure --prefix= in the ticcutils 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.9] )
+CXXFLAGS="$CXXFLAGS $ticcutils_CFLAGS"
+LIBS="$LIBS $ticcutils_LIBS"
+
AC_ARG_WITH(timbl,
[ --with-timbl=DIR use timbl installed in ;
note that you can install timbl in a non-default directory with
./configure --prefix= in the timbl 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([timbl], [timbl >= 6.4.4] )
CXXFLAGS="$CXXFLAGS $timbl_CFLAGS"
LIBS="$LIBS $timbl_LIBS"
@@ -74,23 +85,13 @@ AC_ARG_WITH(mbt,
[ --with-mbt=DIR use mbt installed in ;
note that you can install mbt in a non-default directory with
./configure --prefix= in the mbt installation directory],
- [PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$withval/lib/pkgconfig"])
+ [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([mbt], [mbt >= 3.2.13] )
CXXFLAGS="$CXXFLAGS $mbt_CFLAGS"
LIBS="$LIBS $mbt_LIBS"
-AC_ARG_WITH(ticcutils,
- [ --with-ticcutils=DIR use ticcutils installed in ;
- note that you can install ticcutils in a non-default directory with
- ./configure --prefix= in the ticcutils 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.9] )
-CXXFLAGS="$CXXFLAGS $ticcutils_CFLAGS"
-LIBS="$LIBS $ticcutils_LIBS"
-
AC_CONFIG_FILES([
Makefile
src/Makefile