summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2020-09-09 16:57:19 -0700
committerVito Caputo <vcaputo@pengaru.com>2020-09-09 16:57:19 -0700
commit5084620fd8024a28bb3549c5b96589ee477e0dda (patch)
tree174471aa31d754aabd58e04afc7e0f1233cfac57
parent4904cc9433f56738ac60d7e871c1485da5a6381c (diff)
build: configure libplay w/--with-audio=no
Using AX_SUBDIRS_CONFIGURE() to pass flags to the vendored libplay configure, pass a mandatory --with-audio=no so libplay doesn't want SDL2_Mixer, and stop configuring SDL2_Mixer in pig now that it's not needed at link time.
-rw-r--r--configure.ac10
1 files changed, 2 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 699fd89..04830fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,13 +14,6 @@ PKG_CHECK_MODULES(SDL2, sdl2)
CFLAGS="$CFLAGS $SDL2_CFLAGS"
LIBS="$LIBS $SDL2_LIBS"
-# FIXME libplay needs compile-time configuration to omit the
-# music stuff so we don't need to fulfill the dependency even.
-dnl Check for SDL2_mixer
-PKG_CHECK_MODULES(SDL2_MIXER, SDL2_mixer)
-LIBS="$SDL2_MIXER_LIBS $LIBS"
-CFLAGS="$SDL2_MIXER_CFLAGS $CFLAGS"
-
dnl Check for OpenGL
PKG_CHECK_MODULES(GL, gl)
LIBS="$GL_LIBS $LIBS"
@@ -32,8 +25,9 @@ AC_CONFIG_FILES([
])
AC_CONFIG_SUBDIRS([
- libplay
libstage
])
+AX_SUBDIRS_CONFIGURE([libplay], [--with-audio=no], [], [], [])
+
AC_OUTPUT
© All Rights Reserved