Merged branch 'master' of git://git.tokkee.org/sysdb.

diff --git a/.travis.yml b/.travis.yml
index f0a3403e855b8c4b7c03236eb6bae17310d63946..d3bfbe959e61494ada6cb5ff156e2c64065ac54a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,17 @@
 language: c
+env:
+  - CIOPTIONS="--with-readline=libedit"
+  - CIOPTIONS="--with-readline=libreadline"
 compiler:
   - clang
   - gcc
 before_install:
   - sudo apt-get update -qq
 install:
-  - sudo apt-get install -qq check flex bison libtool
-  - sudo apt-get install -qq libdbi-dev libedit-dev libltdl-dev
+  - sudo apt-get install -qq check flex bison libtool libltdl-dev
+  - sudo apt-get install -qq libdbi-dev libedit-dev libreadline-dev
   - sudo pip install cpp-coveralls --use-mirrors
-before_script:
-  - ./autogen.sh
-script: ./configure --enable-gcov CFLAGS="-O0 -Wno-sign-conversion" && make && make test
+script: ./t/cibuild.sh
 after_success:
   - coveralls --exclude t --verbose
 branches:

diff --git a/configure.ac b/configure.ac
index c1718a7b0681a17b378a667402c422a576a9881c..ac281225e0a703cb0478aa4a809f358bcf3360ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -309,7 +309,7 @@ else
 fi
 
 have_libreadline="no"
-if test "x$have_libedit" = "xno"; then
+if test "x$have_libedit" != "xyes"; then
        if test "x$readline_support" = "xauto" \
                        || test "x$readline_support" = "xlibreadline"; then
                AC_CHECK_LIB([readline], [readline],

diff --git a/t/cibuild.sh b/t/cibuild.sh
new file mode 100755 (executable)
index 0000000..e0754db
--- /dev/null
+++ b/t/cibuild.sh
@@ -0,0 +1,12 @@
+#! /bin/bash
+#
+# SysDB -- t/cibuild.sh
+#
+# Run a continuous integration build for the System DataBase.
+
+set -ex
+
+./autogen.sh
+./configure --enable-gcov $CIOPTIONS CFLAGS="-O0 -Wno-sign-conversion"
+make clean all
+make test