From 3534a54097a62f7e739faeed2f49f6644cb928a4 Mon Sep 17 00:00:00 2001
From: Andrew Brampton <bramp@google.com>
Date: Sun, 14 Feb 2016 02:12:43 -0800
Subject: [PATCH] Droped autoconf to 2.69, and removed the use of
 AC_CHECK_HEADER_STDBOOL as travis only supports a old autoconf

---
 .travis.yml  | 19 +++++++++++++++----
 configure.ac |  4 ++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7d0cc28..13938e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,19 @@ php:
   - '7.0'
   - hhvm
 
+#language: cpp
+#compiler:
+#  - clang
+#  - gcc
+#env:
+#  - CXX=clang
+#  - CXX=gcc
+
+addons:
+  apt:
+    packages:
+    - protobuf-compiler
+
 before_install:
   - composer self-update
 
@@ -15,6 +28,7 @@ install:
 
 before_script:
   - uname -a
+  - cat /etc/lsb-release
   - g++ --version || echo "no g++ found"
   - clang++ --version || echo "no clang++ found"
   - make --version || echo "no make found"
@@ -22,12 +36,9 @@ before_script:
   - autoconf --version || echo "no autoconf found"
   - php --version || echo "no php found"
   - protoc --version || echo "no protoc found"
-  - echo $CXX
-  - echo $CC
 
 script:
-  - ./autogen.sh
-  - ./configure
+  - ./autogen.sh && ./configure
   - make test
 
 cache:
diff --git a/configure.ac b/configure.ac
index 1ad96f9..faa2c14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.69])
+AC_PREREQ([2.68]) #TODO Update when travis moves to a newer version
 AC_INIT([protoc-gen-php], [1.0], [github@bramp.net])
 AC_CONFIG_SRCDIR([src/protoc-gen-php.cc])
 AC_CONFIG_HEADERS([src/config.h])
@@ -37,7 +37,7 @@ AC_SUBST(PROTOBUF_VERSION)
 AC_CHECK_HEADERS([float.h limits.h stdlib.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
-AC_CHECK_HEADER_STDBOOL
+#AC_CHECK_HEADER_STDBOOL #TODO Autoconf > 2.68 is available we can reenable
 AC_C_INLINE
 AC_TYPE_SIZE_T