travis: fix defaults

diff --git a/.travis.yml b/.travis.yml
index 409518b1268a7ed34ca4147cf49b1aa2fa60639f..d5ed3f6758f1b7fe2a21568ff53f278eb7d8d8fc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,19 +26,19 @@ install:
    if ${SASL};
    then
      git clone -b 1.5.9 https://github.com/memcached/memcached &&
-     cd memcached &&
+     cd memcached && ./autogen.sh &&
      CFLAGS="-O2 -pipe" ./configure --prefix=/opt --disable-dependency-tracking --enable-sasl --enable-sasl-pwdb --disable-coverage --disable-docs &&
      make && make install &&
      /opt/bin/memcached -l 127.0.0.1 -p ${MEMCACHED_PORT} -U ${MEMCACHED_PORT} -m 128 &
    fi
 
 before_script:
- - echo stats settings | nc -q 0 localhost ${MEMCACHED_PORT:11211} | column -t
+ - echo stats settings | nc -q 0 localhost ${MEMCACHED_PORT:-11211} | column -t
  - mkdir build
 
 script:
  - cd build
- - cmake -DCMAKE_BUILD_TYPE=${BUILD} -DENABLE_SASL=${SASL} -DMEMCACHED_BINARY=${MEMCACHED_BINARY:/usr/bin/memcached} ..
+ - cmake -DCMAKE_BUILD_TYPE=${BUILD} -DENABLE_SASL=${SASL} -DMEMCACHED_BINARY=${MEMCACHED_BINARY:-/usr/bin/memcached} ..
  - make
  - make test
  - make install DESTDIR=.