Skip to content
This repository has been archived by the owner on May 29, 2018. It is now read-only.

Commit

Permalink
Droped autoconf to 2.69, and removed the use of AC_CHECK_HEADER_STDBO…
Browse files Browse the repository at this point in the history
…OL as travis only supports a old autoconf
  • Loading branch information
bramp committed Feb 15, 2016
1 parent 08c3d17 commit 3534a54
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
19 changes: 15 additions & 4 deletions .travis.yml
Expand Up @@ -8,26 +8,37 @@ php:
- '7.0'
- hhvm

#language: cpp
#compiler:
# - clang
# - gcc
#env:
# - CXX=clang
# - CXX=gcc

addons:
apt:
packages:
- protobuf-compiler

before_install:
- composer self-update

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"
- automake --version || echo "no automake found"
- 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:
Expand Down
4 changes: 2 additions & 2 deletions 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])
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 3534a54

Please sign in to comment.