From: <sv...@op...> - 2024-07-18 16:11:14
|
Author: manx Date: Thu Jul 18 18:11:02 2024 New Revision: 21196 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21196 Log: Merged revision(s) 21195 from trunk/OpenMPT: [Ref] build: Autotools: Use AS_CASE instead of raw shell case. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/autotools/configure.ac Modified: branches/OpenMPT-1.31/build/autotools/configure.ac ============================================================================== --- branches/OpenMPT-1.31/build/autotools/configure.ac Thu Jul 18 18:10:25 2024 (r21195) +++ branches/OpenMPT-1.31/build/autotools/configure.ac Thu Jul 18 18:11:02 2024 (r21196) @@ -84,8 +84,9 @@ AC_CANONICAL_HOST -case $host_os in - mingw32*) + +AS_CASE([$host_os], + [mingw32*],[ LIBOPENMPT_WIN32_LIBS= LIBOPENMPT_LIBS_PRIVATE_WIN32= LIBOPENMPTTEST_WIN32_LIBS="-lole32 -lrpcrt4" @@ -95,8 +96,8 @@ WIN32_CFLAGS="-municode -mthreads" WIN32_CONSOLE_CXXFLAGS=-mconsole WIN32_CONSOLE_CFLAGS=-mconsole - ;; - *) + ], + [ LIBOPENMPT_WIN32_LIBS= LIBOPENMPT_LIBS_PRIVATE_WIN32= LIBOPENMPTTEST_WIN32_LIBS= @@ -106,8 +107,8 @@ WIN32_CFLAGS= WIN32_CONSOLE_CXXFLAGS= WIN32_CONSOLE_CFLAGS= - ;; -esac + ] +) AC_SUBST([LIBOPENMPT_WIN32_LIBS]) AC_SUBST([LIBOPENMPTTEST_WIN32_LIBS]) AC_SUBST([OPENMPT123_WIN32_LIBS]) @@ -210,8 +211,8 @@ # Optional openmpt123 dependency AC_ARG_WITH([pulseaudio], AS_HELP_STRING([--with-pulseaudio], [Enable use of libpulse and libpulse-simple (enabled by default on Linux).])) AS_IF([test "x$enable_openmpt123" != "xno"],[ -case $host_os in - linux*) +AS_CASE([$host_os], + [linux*],[ AS_IF([test "x$with_pulseaudio" != "xno"], [ PKG_CHECK_MODULES([PULSEAUDIO], [libpulse libpulse-simple], @@ -248,8 +249,9 @@ have_pulseaudio=0 ] ) - ;; -esac + ], + [] +) ],[have_pulseaudio=0]) # Optional openmpt123 and examples dependency |