Fixed the compilation of multiple Mac OS X related modules

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index b76426ded9013e69ce4e96a6f100f04a61b80dab..550ab0d024db78027257b034c30d4dc5cab6c1e0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1290,12 +1290,6 @@ VLC_ADD_PLUGIN([access_filter_timeshift])
 VLC_ADD_PLUGIN([access_filter_record])
 VLC_ADD_PLUGIN([access_filter_dump])
 VLC_ADD_PLUGIN([access_filter_bandwidth])
-dnl Packetizers:
-VLC_ADD_PLUGIN([packetizer_mpegvideo])
-VLC_ADD_PLUGIN([packetizer_h264])
-VLC_ADD_PLUGIN([packetizer_mpeg4video])
-VLC_ADD_PLUGIN([packetizer_mpeg4audio])
-VLC_ADD_PLUGIN([packetizer_vc1])
 
 ALIASES="${ALIASES} cvlc"
 
@@ -1725,43 +1719,9 @@ dnl Stream output
 dnl
 AC_ARG_ENABLE(sout,
   [  --enable-sout           Stream output modules (default enabled)])
-if test "${enable_sout}" != "no"
-then
-  dnl Access outputs:
-  VLC_ADD_PLUGIN([access_output_dummy])
-  VLC_ADD_PLUGIN([access_output_udp])
-  VLC_ADD_PLUGIN([access_output_file])
-  VLC_ADD_PLUGIN([access_output_http])
-  dnl Muxers:
-  VLC_ADD_PLUGIN([mux_ps])
-  VLC_ADD_PLUGIN([mux_avi])
-  VLC_ADD_PLUGIN([mux_mp4])
-  VLC_ADD_PLUGIN([mux_asf])
-  VLC_ADD_PLUGIN([mux_dummy])
-  VLC_ADD_PLUGIN([mux_wav])
-  VLC_ADD_PLUGIN([mux_mpjpeg])
-  dnl Packetizers (FIXME: why are the others outside --enable-sout??):
-  VLC_ADD_PLUGIN([packetizer_copy])
-  dnl Stream outputs:
-  VLC_ADD_PLUGIN([stream_out_dummy])
-  VLC_ADD_PLUGIN([stream_out_standard])
-  VLC_ADD_PLUGIN([stream_out_es])
-  VLC_ADD_PLUGIN([stream_out_rtp])
-  VLC_ADD_PLUGIN([stream_out_description])
-  VLC_ADD_PLUGIN([stream_out_duplicate])
-  VLC_ADD_PLUGIN([stream_out_display])
-  VLC_ADD_PLUGIN([stream_out_transcode])
-  VLC_ADD_PLUGIN([stream_out_bridge])
-  VLC_ADD_PLUGIN([stream_out_mosaic_bridge])
-  VLC_ADD_PLUGIN([stream_out_autodel])
-  VLC_ADD_PLUGIN([stream_out_gather])
-#  VLC_ADD_PLUGIN([stream_out_transrate])
-  dnl Misc:
-  VLC_ADD_PLUGIN([vod_rtsp])
-  VLC_ADD_PLUGIN([profile_parser])
-
-  AC_DEFINE(ENABLE_SOUT, 1, Define if you want the stream output support)
-fi
+AS_IF([test "${enable_sout}" != "no"], [
+  AC_DEFINE(ENABLE_SOUT, 1, [Define to 1 for stream output support.])
+])
 AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"])
 
 AC_ARG_ENABLE(switcher,
@@ -4928,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
@@ -5533,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"
@@ -5678,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
@@ -5687,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