From 7676e68d7f5a3da50e1417ca9e142925a3b43040 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= Date: Thu, 1 May 2008 12:57:01 +0200 Subject: [PATCH] Fixed the compilation of multiple Mac OS X related modules by using VLC_ADD_PLUGIN instead of VLC_ADD_BUILTINS. Please check for potential regressions. --- configure.ac | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index d99c90df18..550ab0d024 100644 --- a/configure.ac +++ b/configure.ac @@ -4888,7 +4888,7 @@ if test "${enable_macosx-audio}" != "no" && (test "${SYS}" = "darwin" || test "${enable_macosx-audio}" = "yes") then AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, - [ VLC_ADD_BUILTINS([auhal]) + [ VLC_ADD_PLUGIN([auhal]) VLC_ADD_LDFLAGS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -5493,7 +5493,8 @@ then VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] ) # VLC_ADD_PLUGIN([access_eyetv]) - VLC_ADD_BUILTINS([macosx minimal_macosx]) + VLC_ADD_PLUGIN([macosx]) + VLC_ADD_PLUGIN([minimal_macosx]) ORIGCFLAGS=$CFLAGS CFLAGS="$CFLAGS -x objective-c" @@ -5638,7 +5639,7 @@ then fi if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a) - VLC_ADD_BUILTINS([goom]) + VLC_ADD_PLUGIN([goom]) VLC_ADD_LIBS([goom],[-L${real_goom_tree}/src/.libs -lgoom2]) VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE]) else @@ -5647,7 +5648,7 @@ then AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree}) if test -f "${real_goom_tree}/libgoom.a"; then AC_MSG_RESULT(${real_goom_tree}/libgoom.a) - VLC_ADD_BUILTINS([goom]) + VLC_ADD_PLUGIN([goom]) VLC_ADD_LIBS([goom],[-L${real_goom_tree} -lgoom]) VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM]) else -- 2.39.2