build: ldflags conversion: coreaudio.

Straight-forward transformation, relevant to MacOS only.

diff --git a/Makefile.in b/Makefile.in
index 3ed44475ab49b3f45d2e9d8a30f7e5c1cf85d371..6cd05d93d14eb384f13774b7d48ecd832dc88be2 100644 (file)
--- 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@
 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")
 
 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)
 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)
 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 782bedeadacd373e656327393f2bfe502aa25ddd..68fed0bbbdacc2c24f4a4c2dab7ea04bfc3ce761 100644 (file)
--- 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"
        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_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_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_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)
        writers="$writers osx"
        default_writer="OSX_WRITE"
        AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)