From 5d9a7ec36c7dded1ca21a1ff7472c299ceaf0d7e Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 30 Sep 2014 20:57:32 +0100 Subject: [PATCH 1/3] Fix travis build by adding m4 dir --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 200d4476..0ce493f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,5 +20,6 @@ install: - sudo make install - cd ../.. - rm -rf cmocka-0.4.1 + - mkdir m4 - ./bootstrap.sh script: ./configure && make && make check From 38b58b7a6172ef1ef81e20f3c7340781255d369d Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 30 Sep 2014 21:03:29 +0100 Subject: [PATCH 2/3] Revert "Fix travis build by adding m4 dir" This reverts commit 5d9a7ec36c7dded1ca21a1ff7472c299ceaf0d7e. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0ce493f9..200d4476 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,5 @@ install: - sudo make install - cd ../.. - rm -rf cmocka-0.4.1 - - mkdir m4 - ./bootstrap.sh script: ./configure && make && make check From 3dc14a834259dd3b3584931bb4d4e8ea5f079690 Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 30 Sep 2014 21:06:09 +0100 Subject: [PATCH 3/3] travis: added m4 dir for libstrophe --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 200d4476..c87d68b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ install: - sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr2-dev - git clone git://github.com/strophe/libstrophe.git - cd libstrophe + - mkdir m4 - ./bootstrap.sh - ./configure --prefix=/usr - make