From 35d7d71ff1c14fbb59bcf08ff2efa91460967183 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[EMAIL REDACTED]>
Date: Mon, 12 Apr 2021 13:48:37 +0100
Subject: [PATCH] build: Move Automake options into configure.ac
Some Automake options, such as tar-ustar, can only be passed in this
way, and cannot be in the $(AUTOMAKE_OPTIONS) make variable.
Signed-off-by: Simon McVittie <smcv@collabora.com>
---
Makefile.am | 1 -
configure.ac | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 120a640..dd1aefe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
# Makefile.am for the SDL truetype font loading library and viewer
ACLOCAL_AMFLAGS = -I acinclude
-AUTOMAKE_OPTIONS= foreign subdir-objects
lib_LTLIBRARIES = libSDL2_ttf.la
diff --git a/configure.ac b/configure.ac
index f5e33e1..ad5e2e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ dnl Detect the canonical build and host environments
AC_CANONICAL_HOST
dnl Setup for automake
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign subdir-objects])
dnl Check for tools
AC_PROG_CC