From 9139d9496058d888d33524d80414600f75f795a1 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Fri, 13 Sep 2013 07:13:03 +0000 Subject: [PATCH] build: ldflags conversion: coreaudio. Straight-forward transformation, relevant to MacOS only. --- Makefile.in | 3 ++- configure.ac | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3ed44475..6cd05d93 100644 --- a/Makefile.in +++ b/Makefile.in @@ -41,6 +41,7 @@ gcrypt_ldflags := @gcrypt_ldflags@ socket_ldflags := @socket_ldflags@ nsl_ldflags := @nsl_ldflags@ curses_ldflags := @curses_ldflags@ +core_audio_ldflags := @core_audio_ldflags@ build_date := $(shell date) uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS") @@ -275,7 +276,7 @@ ifeq ($(findstring clean, $(MAKECMDGOALS)),) endif para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags) -para_write para_play para_audiod: LDFLAGS += $(ao_ldflags) +para_write para_play para_audiod: LDFLAGS += $(ao_ldflags) $(core_audio_ldflags) para_client para_audioc para_play : LDFLAGS += $(readline_ldflags) para_server: LDFLAGS += $(osl_ldflags) para_gui: LDFLAGS += $(curses_ldflags) diff --git a/configure.ac b/configure.ac index 782bedea..68fed0bb 100644 --- a/configure.ac +++ b/configure.ac @@ -503,19 +503,17 @@ if test ${have_core_audio} = yes; then f2="-framework AudioToolbox" f3="-framework AudioUnit" f4="-framework CoreServices" - f="$f1 $f2 $f3 $f4" + core_audio_ldflags="$f1 $f2 $f3 $f4" + AC_SUBST(core_audio_ldflags) audiod_errlist_objs="$audiod_errlist_objs osx_write ipc" audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline" - audiod_ldflags="$audiod_ldflags $f" play_errlist_objs="$play_errlist_objs osx_write ipc" play_cmdline_objs="$play_cmdline_objs osx_write.cmdline" - play_ldflags="$play_ldflags $f" write_errlist_objs="$write_errlist_objs osx_write ipc" write_cmdline_objs="$write_cmdline_objs osx_write.cmdline" - write_ldflags="$write_ldflags $f" writers="$writers osx" default_writer="OSX_WRITE" AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X) -- 2.39.5