From 60f5150d2b585af3a939f12d0105e5ecb23d6a12 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 15 Apr 2009 22:23:50 +0200 Subject: configure.ac: moved the sidplay check to its argument Checks for features should be right next to its argument definition. --- configure.ac | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index da73fd4c1..46e6197ab 100644 --- a/configure.ac +++ b/configure.ac @@ -476,6 +476,17 @@ AC_ARG_ENABLE(sidplay, [enable C64 SID support via libsidplay2 (default: disable)]),, enable_sidplay=no) +if test x$enable_sidplay = xyes; then + # we have no test yet.. we're not using pkg-config here + # because libsidplay2's .pc file requires libtool + AC_SUBST(SIDPLAY_LIBS,"-lsidplay2 -lresid-builder") + AC_SUBST(SIDPLAY_CFLAGS,) + + AC_DEFINE(ENABLE_SIDPLAY, 1, [Define for libsidplay2 support]) +fi + +AM_CONDITIONAL(ENABLE_SIDPLAY, test x$enable_sidplay = xyes) + AC_ARG_ENABLE(fluidsynth, AS_HELP_STRING([--enable-fluidsynth], [enable MIDI support via fluidsynth (default: disable)]),, @@ -891,17 +902,6 @@ fi AM_CONDITIONAL(HAVE_FFMPEG, test x$enable_ffmpeg = xyes) -if test x$enable_sidplay = xyes; then - # we have no test yet.. we're not using pkg-config here - # because libsidplay2's .pc file requires libtool - AC_SUBST(SIDPLAY_LIBS,"-lsidplay2 -lresid-builder") - AC_SUBST(SIDPLAY_CFLAGS,) - - AC_DEFINE(ENABLE_SIDPLAY, 1, [Define for libsidplay2 support]) -fi - -AM_CONDITIONAL(ENABLE_SIDPLAY, test x$enable_sidplay = xyes) - if test x$enable_fluidsynth = xyes; then PKG_CHECK_MODULES(FLUIDSYNTH, [fluidsynth], AC_DEFINE(ENABLE_FLUIDSYNTH, 1, [Define for fluidsynth support]), -- cgit v1.2.3