osx dialog provider: minor cleanup

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index e0f7397d01afc4556a4580b967312542b7e5fc91..4d72dcf3112dfe0cbfc7345b134f4256feab9cc8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -729,7 +729,7 @@ AC_CHECK_LIB(m,pow,[
   VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realaudio realvideo opengl],[-lm])
 ])
 AC_CHECK_LIB(m,sqrt,[
-  VLC_ADD_LIBS([headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract],[-lm])
+  VLC_ADD_LIBS([headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball],[-lm])
 ])
 AC_CHECK_LIB(m,ceil,[
   VLC_ADD_LIBS([access_imem hotkeys mosaic swscale_omap],[-lm])
@@ -1200,6 +1200,7 @@ VLC_ADD_PLUGIN([wave])
 VLC_ADD_PLUGIN([ripple])
 VLC_ADD_PLUGIN([psychedelic])
 VLC_ADD_PLUGIN([gradient])
+VLC_ADD_PLUGIN([ball])
 VLC_ADD_PLUGIN([motionblur])
 VLC_ADD_PLUGIN([rv32])
 VLC_ADD_PLUGIN([rotate])
@@ -4137,8 +4138,8 @@ dnl  CoreAudio plugin
 dnl
 AC_ARG_ENABLE(macosx-audio,
   [  --enable-macosx-audio   Mac OS X audio module (default enabled on MacOS X)])
-if test "${enable_macosx-audio}" != "no" &&
-  (test "${SYS}" = "darwin" || test "${enable_macosx-audio}" = "yes")
+if test "x${enable_macosx_audio}" != "xno" &&
+  (test "${SYS}" = "darwin" || test "${enable_macosx_audio}" = "yes")
 then
   AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
     [ VLC_ADD_PLUGIN([auhal])
@@ -4377,7 +4378,7 @@ AC_ARG_ENABLE(macosx,
 if test "x${enable_macosx}" = "xyes"
 then
   VLC_ADD_LDFLAGS([access_eyetv],                     [-Wl,-framework,Foundation])
-  VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer qtcapture],[-Wl,-framework,Cocoa])
+  VLC_ADD_LDFLAGS([macosx minimal_macosx macosx_dialog_provider opengllayer qtcapture],[-Wl,-framework,Cocoa])
   VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,OpenGL])
   VLC_ADD_LDFLAGS([macosx minimal_macosx],            [-Wl,-framework,Carbon])
   VLC_ADD_LDFLAGS([macosx minimal_macosx],            [-Wl,-framework,CoreServices])
@@ -4399,6 +4400,7 @@ then
   VLC_ADD_PLUGIN([macosx])
   VLC_ADD_PLUGIN([minimal_macosx])
   VLC_ADD_PLUGIN([opengllayer])
+  VLC_ADD_PLUGIN([macosx_dialog_provider])
 fi
 
 dnl
@@ -4408,21 +4410,19 @@ AC_ARG_ENABLE(macosx-minimal,
   [  --enable-macosx-minimal minimal Mac OS X support (default disabled)])
 if test "x${enable_macosx_minimal}" = "xyes"
 then
-  VLC_ADD_LDFLAGS([minimal_macosx opengllayer qtcapture],[-Wl,-framework,Cocoa])
-  VLC_ADD_LDFLAGS([minimal_macosx opengllayer],[-Wl,-framework,OpenGL])
-  VLC_ADD_LDFLAGS([minimal_macosx],            [-Wl,-framework,Carbon])
-  VLC_ADD_LDFLAGS([minimal_macosx],            [-Wl,-framework,CoreServices])
-  VLC_ADD_LDFLAGS([minimal_macosx],            [-Wl,-framework,AGL])
+  VLC_ADD_LDFLAGS([vout_macosx qtcapture macosx_dialog_provider],[-Wl,-framework,Cocoa])
+  VLC_ADD_LDFLAGS([vout_macosx],          [-Wl,-framework,OpenGL])
 
   VLC_ADD_LDFLAGS([qtcapture],                        [-Wl,-framework,QTKit])
   VLC_ADD_LDFLAGS([qtcapture],                        [-Wl,-framework,CoreAudio])
   VLC_ADD_LDFLAGS([opengllayer qtcapture],            [-Wl,-framework,QuartzCore])
   VLC_ADD_LDFLAGS([qtcapture],                        [-Wl,-framework,CoreVideo])
-  VLC_ADD_OBJCFLAGS([minimal_macosx opengllayer], [-fobjc-exceptions] )
+  VLC_ADD_OBJCFLAGS([vout_macosx],                 [-fobjc-exceptions] )
 
   VLC_ADD_PLUGIN([qtcapture])
   VLC_ADD_PLUGIN([minimal_macosx])
   VLC_ADD_PLUGIN([opengllayer])
+  VLC_ADD_PLUGIN([macosx_dialog_provider])
 fi
 
 dnl
@@ -5191,6 +5191,7 @@ AC_CONFIG_FILES([
   modules/gui/macosx/Makefile
   modules/gui/hildon/Makefile
   modules/gui/minimal_macosx/Makefile
+  modules/gui/macosx_dialog_provider/Makefile
   modules/gui/qnx/Makefile
   modules/gui/qt4/Makefile
   modules/gui/skins2/Makefile