Revert "build: Tell autoconf to use a macro dir"

This reverts commit de84448e3a.

In order to make Epoxy build on Travis with the Precise package set, we
need to revert this commit, as the autotools version shipped on Ubuntu
12.04 bail out at the missing macro directory — whereas newer versions
just create it if needed.

Updating the Travis environment to Trusty allows the build to finish,
but have the knock-on effect of making more tests run — and the
EGL-without-GLX tests fail. Since there's nothing newer than Trusty on
Travis, we should back out this change until we have the ability to
build a suitable test/CI environment.
macos/v1.5.9
Emmanuele Bassi 8 years ago
parent a11c76e1fa
commit 136d3cde83
  1. 2
      Makefile.am
  2. 1
      configure.ac

@ -20,8 +20,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE. # IN THE SOFTWARE.
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = include/epoxy src SUBDIRS = include/epoxy src
SUBDIRS += test SUBDIRS += test

@ -27,7 +27,6 @@ AC_INIT([libepoxy],
[libepoxy]) [libepoxy])
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
# Initialize Automake # Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects]) AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])

Loading…
Cancel
Save