[vlc-devel] [PATCH 2/3] configure.ac: Replace AC_ARG_ENABLE with VLC_ARG_ENABLE.

Georgi Chorbadzhiyski gf at unixsol.org
Thu Dec 1 17:43:17 CET 2011


This allows --disable-all to work.
---
 configure.ac   |  219 +++++++++++++++++++++++++++++--------------------------
 m4/with_pkg.m4 |    2 +-
 2 files changed, 116 insertions(+), 105 deletions(-)

diff --git a/configure.ac b/configure.ac
index 09766ac..a44f447 100644
--- a/configure.ac
+++ b/configure.ac
@@ -764,7 +764,7 @@ AS_IF([test "${enable_non_utf8}" != "no"], [
 
 
 dnl Check for dbus
-AC_ARG_ENABLE(dbus,
+VLC_ARG_ENABLE(dbus,
   [AS_HELP_STRING([--enable-dbus],
     [compile D-Bus message bus support (default enabled)])])
 case "${SYS}" in
@@ -777,7 +777,7 @@ then
       VLC_ADD_LIBS([libvlccore],[$DBUS_LIBS])
       VLC_ADD_CFLAGS([libvlccore],[$DBUS_CFLAGS])
       dnl Check for dbus control interface
-        AC_ARG_ENABLE(dbus-control,
+        VLC_ARG_ENABLE(dbus-control,
           [AS_HELP_STRING([--disable-dbus-control],
             [D-Bus control interface (default enabled)])])
         if test "${enable_dbus_control}" != "no"
@@ -787,7 +787,7 @@ then
           VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS])
         fi
       dnl Check for Telepathy
-        AC_ARG_ENABLE(telepathy,
+        VLC_ARG_ENABLE(telepathy,
           AS_HELP_STRING([--enable-telepathy],[Telepathy Presence plugin through DBus(default enabled)]))
         if test "${enable_telepathy}" != "no"; then
           VLC_ADD_PLUGIN([telepathy])
@@ -799,7 +799,9 @@ then
         VLC_ADD_LIBS([inhibit],[$DBUS_LIBS])
         VLC_ADD_CFLAGS([inhibit],[$DBUS_CFLAGS])
     ],
+    [AS_IF([test "${enable_dbus_control}" = "yes"],
     [AC_MSG_ERROR([${DBUS_PKG_ERRORS}.])]
+    )]
   )
 fi
 ;;
@@ -1518,9 +1520,18 @@ if test "${enable_optimize_memory}" = "yes"; then
 fi
 
 dnl
+dnl Disable all plugins except explicitly enabled via --enable-XXXX
+dnl
+AC_ARG_ENABLE(all,
+  [AS_HELP_STRING([--disable-all],
+    [disable all plugins except explicitly enabled via --enable-xxx.])],
+  [disable_all="yes"],
+  [disable_all="no"])
+
+dnl
 dnl Allow running as root (useful for people running on embedded platforms)
 dnl
-AC_ARG_ENABLE(run-as-root,
+VLC_ARG_ENABLE(run-as-root,
   [AS_HELP_STRING([--enable-run-as-root],
     [allow running VLC as root (default disabled)])])
 AS_IF([test "${enable_run_as_root}" = "yes"],[
@@ -1531,7 +1542,7 @@ AS_IF([test "${enable_run_as_root}" = "yes"],[
 dnl
 dnl Stream output
 dnl
-AC_ARG_ENABLE(sout,
+VLC_ARG_ENABLE(sout,
   [AS_HELP_STRING([--disable-sout],
     [disable streaming output (default enabled)])])
 AS_IF([test "${enable_sout}" != "no"], [
@@ -1540,7 +1551,7 @@ AS_IF([test "${enable_sout}" != "no"], [
 AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"])
 
 dnl Lua modules
-AC_ARG_ENABLE(lua,
+VLC_ARG_ENABLE(lua,
   [AS_HELP_STRING([--disable-lua],
     [disable LUA scripting support (default enabled)])])
 if test "${enable_lua}" != "no"
@@ -1587,7 +1598,7 @@ AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
 dnl
 dnl HTTP daemon
 dnl
-AC_ARG_ENABLE(httpd,
+VLC_ARG_ENABLE(httpd,
   [AS_HELP_STRING([--disable-httpd],
     [disable the built-in HTTP server (default enabled)])])
 if test "${enable_httpd}" != "no"
@@ -1600,7 +1611,7 @@ AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
 dnl
 dnl VideoLAN manager
 dnl
-AC_ARG_ENABLE(vlm,
+VLC_ARG_ENABLE(vlm,
   [AS_HELP_STRING([--disable-vlm],
     [disable the stream manager (default enabled)])],,
   [enable_vlm="${enable_sout}"])
@@ -1622,7 +1633,7 @@ EXTEND_HELP_STRING([Input plugins:])
 dnl
 dnl libproxy support
 dnl
-AC_ARG_ENABLE(libproxy,
+VLC_ARG_ENABLE(libproxy,
   [AS_HELP_STRING([--enable-libproxy],[support libproxy (default auto)])])
 AS_IF([test "${enable_libproxy}" != "no"], [
   PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, [
@@ -1639,7 +1650,7 @@ AS_IF([test "${enable_libproxy}" != "no"], [
 dnl
 dnl  live555 input
 dnl
-AC_ARG_ENABLE(live555,
+VLC_ARG_ENABLE(live555,
   [AS_HELP_STRING([--enable-live555],
     [enable RTSP input through live555 (default enabled)])])
 AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [
@@ -1736,7 +1747,7 @@ dnl
 PKG_ENABLE_MODULES_VLC([DC1394], [], [libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0], [dc1394 access module], [auto])
 PKG_ENABLE_MODULES_VLC([DV], [access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto])
 
-AC_ARG_ENABLE(linsys,
+VLC_ARG_ENABLE(linsys,
   [AS_HELP_STRING([--enable-linsys],
     [Linux Linear Systems Ltd. SDI and HD-SDI input cards (default enabled)])])
 if test "$SYS" = "linux" -a "${enable_linsys}" != "no"; then
@@ -1757,7 +1768,7 @@ PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread], [dvdread input module], [auto])
 dnl
 dnl libdvdnav plugin
 dnl
-AC_ARG_ENABLE(dvdnav,
+VLC_ARG_ENABLE(dvdnav,
   [AS_HELP_STRING([--disable-dvdnav],
     [disable DVD navigation with libdvdnav (default auto)])])
 if test "${enable_dvdnav}" != "no"
@@ -1778,7 +1789,7 @@ fi
 dnl
 dnl  Windows DirectShow access module
 dnl
-AC_ARG_ENABLE(dshow,
+VLC_ARG_ENABLE(dshow,
   [AS_HELP_STRING([--disable-dshow],
     [support DirectShow (default auto)])])
 if test "${enable_dshow}" != "no"
@@ -1808,7 +1819,7 @@ PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv], (Ope
 dnl
 dnl  libsmbclient plugin
 dnl
-AC_ARG_ENABLE(smb,
+VLC_ARG_ENABLE(smb,
   [AS_HELP_STRING([--disable-smb], [disable SMB/CIFS support (default auto)])])
 if test "${enable_smb}" != "no"; then
   AC_CHECK_HEADERS(libsmbclient.h,
@@ -1823,7 +1834,7 @@ fi
 dnl
 dnl sftp access support
 dnl
-AC_ARG_ENABLE(sftp,
+VLC_ARG_ENABLE(sftp,
   [AS_HELP_STRING([--enable-sftp],
     [support SFTP file transfer via libssh2 (default disabled)])])
 if test "${enable_sftp}" = "yes"; then
@@ -1836,9 +1847,9 @@ fi
 dnl
 dnl  Video4Linux 2
 dnl
-AC_ARG_ENABLE(libv4l2, [AS_HELP_STRING([--disable-libv4l2],
+VLC_ARG_ENABLE(libv4l2, [AS_HELP_STRING([--disable-libv4l2],
   [disable userspace V4L2 library (default auto)])])
-AC_ARG_ENABLE(pvr, [AS_HELP_STRING([--enable-pvr],
+VLC_ARG_ENABLE(pvr, [AS_HELP_STRING([--enable-pvr],
   [support PVR V4L2 cards (default disabled)])])
 have_v4l2="no"
 AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [
@@ -1861,7 +1872,7 @@ AM_CONDITIONAL(HAVE_V4L2, [test "${have_v4l2}" != "no"])
 dnl
 dnl special access module for Blackmagic SDI cards
 dnl
-AC_ARG_ENABLE(decklink,
+VLC_ARG_ENABLE(decklink,
   [AS_HELP_STRING([--disable-decklink],
     [disable Blackmagic DeckLink SDI input (default auto)])])
 AC_ARG_WITH(decklink_sdk,
@@ -1892,7 +1903,7 @@ PKG_ENABLE_MODULES_VLC([GNOMEVFS], [access_gnomevfs], [gnome-vfs-2.0], [GnomeVFS
 dnl
 dnl  VCDX modules
 dnl
-AC_ARG_ENABLE(vcdx,
+VLC_ARG_ENABLE(vcdx,
   [AS_HELP_STRING([--enable-vcdx],
     [navigate VCD with libvcdinfo (default disabled)])])
 if test "${enable_vcdx}" = "yes"
@@ -1911,11 +1922,11 @@ fi
 dnl
 dnl  Built-in CD-DA and VCD module
 dnl
-AC_ARG_ENABLE(vcd,
+VLC_ARG_ENABLE(vcd,
   [AS_HELP_STRING([--disable-vcd],
     [disable built-in VCD and CD-DA support (default enabled)])])
 
-AC_ARG_ENABLE(libcddb,
+VLC_ARG_ENABLE(libcddb,
   [AS_HELP_STRING([--disable-libcddb],
     [disable CDDB for Audio CD (default enabled)])])
 
@@ -1989,7 +2000,7 @@ AM_CONDITIONAL([HAVE_LINUX_DVB], [test "$ac_cv_linux_s2api" = "yes"])
 dnl
 dnl  Screen capture module
 dnl
-AC_ARG_ENABLE(screen,
+VLC_ARG_ENABLE(screen,
   [AS_HELP_STRING([--enable-screen],
     [disable screen capture (default enabled)])])
 if test "${enable_screen}" != "no"; then
@@ -2009,7 +2020,7 @@ fi
 dnl
 dnl  Real RTSP plugin
 dnl
-AC_ARG_ENABLE(realrtsp,
+VLC_ARG_ENABLE(realrtsp,
   [  --enable-realrtsp       Real RTSP module (default disabled)])
 if test "${enable_realrtsp}" = "yes"; then
   VLC_ADD_PLUGIN([access_realrtsp])
@@ -2017,7 +2028,7 @@ fi
 
 dnl
 dnl MacOS eyeTV
-AC_ARG_ENABLE(macosx-eyetv,
+VLC_ARG_ENABLE(macosx-eyetv,
   [  --enable-macosx-eyetv   Mac OS X EyeTV (TNT Tuner) module (default enabled on Mac OS X)])
 if test "x${enable_macosx_eyetv}" != "xno" &&
   (test "${SYS}" = "darwin" || test "${enable_macosx_eyetv}" = "yes")
@@ -2028,7 +2039,7 @@ fi
 
 dnl
 dnl QTKit
-AC_ARG_ENABLE(macosx-qtkit,
+VLC_ARG_ENABLE(macosx-qtkit,
   [  --enable-macosx-qtkit Mac OS X qtcapture (video) and qtsound (audio) module (default enabled on Mac OS X)])
 if test "x${enable_macosx_qtkit}" != "xno" &&
   (test "${SYS}" = "darwin" || test "${enable_macosx_qtkit}" = "yes")
@@ -2056,7 +2067,7 @@ AM_CONDITIONAL(HAVE_DVBPSI, [test "${have_dvbpsi}" = "yes"])
 dnl
 dnl  GME demux plugin
 dnl
-AC_ARG_ENABLE(gme,
+VLC_ARG_ENABLE(gme,
   [AS_HELP_STRING([--enable-gme],
     [use Game Music Emu (default auto)])])
 AS_IF([test "${enable_gme}" != "no"], [
@@ -2074,7 +2085,7 @@ AS_IF([test "${enable_gme}" != "no"], [
 dnl
 dnl  SIDPlay plugin
 dnl
-AC_ARG_ENABLE(sid,
+VLC_ARG_ENABLE(sid,
     [AS_HELP_STRING([--enable-sid],[C64 sid demux support (default auto)])])
 AS_IF([test "${enable_sid}" != "no"], [
     PKG_CHECK_MODULES(SID, [libsidplay2], [
@@ -2115,7 +2126,7 @@ fi
 dnl
 dnl  matroska demux plugin
 dnl
-AC_ARG_ENABLE(mkv,
+VLC_ARG_ENABLE(mkv,
   [AS_HELP_STRING([--disable-mkv],
     [do not use libmatroska (default auto)])])
 if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then
@@ -2170,7 +2181,7 @@ fi
 dnl
 dnl  modplug demux plugin
 dnl
-AC_ARG_ENABLE(mod,
+VLC_ARG_ENABLE(mod,
   [AS_HELP_STRING([--disable-mod],
     [do not use libmodplug (default auto)])])
 if test "${enable_mod}" != "no" ; then
@@ -2188,7 +2199,7 @@ fi
 dnl
 dnl  mpc demux plugin
 dnl
-AC_ARG_ENABLE(mpc,
+VLC_ARG_ENABLE(mpc,
   [AS_HELP_STRING([--disable-mpc], [do not use libmpcdec (default auto)])])
 if test "${enable_mpc}" != "no"
 then
@@ -2209,7 +2220,7 @@ EXTEND_HELP_STRING([Codec plugins:])
 dnl
 dnl wmafixed plugin
 dnl
-AC_ARG_ENABLE(wma-fixed,
+VLC_ARG_ENABLE(wma-fixed,
   [  --enable-wma-fixed      libwma-fixed module (default disabled)])
 if test "${enable_wma_fixed}" = "yes"
 then
@@ -2219,7 +2230,7 @@ fi
 dnl
 dnl shine fixed point mp3 encoder
 dnl
-AC_ARG_ENABLE(shine,
+VLC_ARG_ENABLE(shine,
   [  --enable-shine          shine mp3 encoding module (default disabled)])
 if test "${enable_shine}" = "yes"
 then
@@ -2229,7 +2240,7 @@ fi
 dnl
 dnl openmax il codec plugin
 dnl
-AC_ARG_ENABLE(omxil,
+VLC_ARG_ENABLE(omxil,
   [  --enable-omxil          openmax il codec module (default disabled)])
 if test "${enable_omxil}" = "yes"
 then
@@ -2240,7 +2251,7 @@ fi
 dnl
 dnl iomx codec plugin
 dnl
-AC_ARG_ENABLE(iomx,
+VLC_ARG_ENABLE(iomx,
   [  --enable-iomx           iomx codec module (default disabled)])
 if test "${enable_iomx}" = "yes"
 then
@@ -2261,7 +2272,7 @@ fi
 dnl
 dnl CrystalHD codec plugin
 dnl
-AC_ARG_ENABLE(crystalhd,
+VLC_ARG_ENABLE(crystalhd,
   [  --enable-crystalhd      crystalhd codec plugin (default auto)])
 if test "${enable_crystalhd}" != "no"; then
     AC_CHECK_HEADER(libcrystalhd/libcrystalhd_if.h, [
@@ -2290,7 +2301,7 @@ fi
 dnl
 dnl  mad plugin
 dnl
-AC_ARG_ENABLE(mad,
+VLC_ARG_ENABLE(mad,
   [  --enable-mad            libmad module (default enabled)])
 if test "${enable_mad}" != "no"
 then
@@ -2347,7 +2358,7 @@ then
 fi
 
 
-AC_ARG_ENABLE(merge-ffmpeg,
+VLC_ARG_ENABLE(merge-ffmpeg,
 [  --enable-merge-ffmpeg   merge FFmpeg-based plugins (default disabled)],, [
   enable_merge_ffmpeg="no"
 ])
@@ -2363,7 +2374,7 @@ VLC_RESTORE_FLAGS
 dnl
 dnl  avcodec decoder/encoder plugin
 dnl
-AC_ARG_ENABLE(avcodec,
+VLC_ARG_ENABLE(avcodec,
 [  --enable-avcodec        libavcodec codec (default enabled)])
 AS_IF([test "${enable_avcodec}" != "no"], [
   PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.25.0 libavutil],
@@ -2391,7 +2402,7 @@ AS_IF([test "${enable_avcodec}" != "no"], [
 dnl
 dnl libva needs avcodec
 dnl
-AC_ARG_ENABLE(libva,
+VLC_ARG_ENABLE(libva,
   [  --enable-libva          VAAPI GPU decoding support (libVA) (default auto)])
 
 AS_IF([test "${enable_libva}" = "yes" -a "${have_avcodec}" != "yes" ], [
@@ -2427,7 +2438,7 @@ AS_IF([test "${enable_libva}" != "no"], [
 dnl
 dnl dxva2 needs avcodec
 dnl
-AC_ARG_ENABLE(dxva2,
+VLC_ARG_ENABLE(dxva2,
   [  --enable-dxva2          DxVA2 GPU decoding support (default auto)])
 
 AS_IF([test "${enable_dxva2}" != "no"], [
@@ -2461,7 +2472,7 @@ AS_IF([test "${enable_dxva2}" != "no"], [
 dnl
 dnl stream_out switcher needs libavcodec
 dnl
-AC_ARG_ENABLE(switcher,
+VLC_ARG_ENABLE(switcher,
   [  --enable-switcher       Stream-out switcher plugin (default disabled)])
 AS_IF([test "${enable_switcher}" = "yes"], [
   AS_IF([test "x${have_avcodec}" = "xyes"], [
@@ -2477,7 +2488,7 @@ dnl
 dnl  avformat demuxer/muxer plugin
 dnl
 
-AC_ARG_ENABLE(avformat,
+VLC_ARG_ENABLE(avformat,
 [  --enable-avformat       libavformat containers (default enabled)],, [
   enable_avformat="${have_avcodec}"
 ])
@@ -2511,7 +2522,7 @@ dnl
 dnl  swscale image scaling and conversion plugin
 dnl
 
-AC_ARG_ENABLE(swscale,
+VLC_ARG_ENABLE(swscale,
   AS_HELP_STRING([--enable-swscale],[libswscale image scaling and conversion
           (default enabled)]))
 if test "${enable_swscale}" != "no"
@@ -2538,7 +2549,7 @@ dnl
 dnl  postproc plugin
 dnl
 
-AC_ARG_ENABLE(postproc,
+VLC_ARG_ENABLE(postproc,
 [  --enable-postproc       libpostproc image post-processing (default enabled)])
 if test "${enable_postproc}" != "no"
 then
@@ -2560,7 +2571,7 @@ fi
 dnl
 dnl  faad decoder plugin
 dnl
-AC_ARG_ENABLE(faad,
+VLC_ARG_ENABLE(faad,
 [  --enable-faad           faad codec (default disabled)])
 if test "${enable_faad}" = "yes"
 then
@@ -2613,7 +2624,7 @@ PKG_ENABLE_MODULES_VLC([TWOLAME], [], [twolame], [MPEG Audio Layer 2 encoder], [
 dnl
 dnl  QuickTime plugin
 dnl
-AC_ARG_ENABLE(quicktime,
+VLC_ARG_ENABLE(quicktime,
   [  --enable-quicktime      QuickTime module (deprecated)])
 if test "${enable_quicktime}" = "yes"; then
   if test "${SYS}" = "mingw32"; then
@@ -2629,7 +2640,7 @@ fi
 dnl
 dnl  Real plugin
 dnl
-AC_ARG_ENABLE(real,
+VLC_ARG_ENABLE(real,
   [  --enable-real           Real video decoder module (default disabled)])
 if test "${enable_real}" = "yes"; then
   VLC_ADD_PLUGIN([realvideo])
@@ -2638,7 +2649,7 @@ fi
 dnl
 dnl A52/AC3 decoder plugin
 dnl
-AC_ARG_ENABLE(a52,
+VLC_ARG_ENABLE(a52,
   [  --enable-a52            A/52 support with liba52 (default enabled)])
 if test "${enable_a52}" != "no"
 then
@@ -2735,7 +2746,7 @@ PKG_ENABLE_MODULES_VLC([VORBIS], [], [ogg vorbis >= 1.1 vorbisenc >= 1.1], [Vorb
 dnl
 dnl  Tremor plugin
 dnl
-AC_ARG_ENABLE(tremor,
+VLC_ARG_ENABLE(tremor,
   [  --enable-tremor         Tremor decoder support (default disabled)])
 if test "${enable_tremor}" = "yes"
 then
@@ -2781,7 +2792,7 @@ PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.10], [dirac
 dnl
 dnl  PNG decoder module
 dnl
-AC_ARG_ENABLE(png,
+VLC_ARG_ENABLE(png,
   [  --enable-png            PNG support (default enabled)])
 if test "${enable_png}" != "no"; then
 AC_CHECK_HEADERS(png.h, [
@@ -2799,7 +2810,7 @@ AM_CONDITIONAL(BUILD_OSDMENU, [test "${enable_png}" != "no"])
 dnl
 dnl H264 encoder plugin (using libx264)
 dnl
-AC_ARG_ENABLE(x264,
+VLC_ARG_ENABLE(x264,
   [  --enable-x264           H264 encoding support with libx264 (default enabled)])
 if test "${enable_x264}" != "no"; then
   AC_ARG_WITH(x264-tree,
@@ -2866,10 +2877,10 @@ dnl vbi decoder plugin (using libzbvi)
 dnl telx module
 dnl uncompatible
 dnl
-AC_ARG_ENABLE(zvbi,
+VLC_ARG_ENABLE(zvbi,
   AS_HELP_STRING([--enable-zvbi],[VBI (inc. Teletext) decoding support with
                   libzvbi (default enabled)]))
-AC_ARG_ENABLE(telx,
+VLC_ARG_ENABLE(telx,
   AS_HELP_STRING([--enable-telx],[Teletext decoding module (conflicting with
                   zvbi) (default enabled if zvbi is absent)]))
 
@@ -2897,7 +2908,7 @@ AS_IF( [test "${enable_telx}" != "no" ],[
 dnl
 dnl libass subtitle rendering module
 dnl
-AC_ARG_ENABLE(libass,
+VLC_ARG_ENABLE(libass,
   [  --enable-libass         Subtitle support using libass (default enabled)])
 AS_IF( [test "${enable_libass}" != "no"], [
   PKG_CHECK_MODULES(LIBASS, [libass >= 0.9.8],
@@ -2923,7 +2934,7 @@ PKG_ENABLE_MODULES_VLC([KATE], [], [kate >= 0.3.0], [kate codec], [auto])
 dnl
 dnl  tiger rendering for kate decoder plugin
 dnl
-AC_ARG_ENABLE(tiger,
+VLC_ARG_ENABLE(tiger,
 [  --enable-tiger          Tiger rendering library for Kate streams (default auto)])
 AS_IF([test "${enable_tiger}" != "no"], [
   PKG_CHECK_MODULES(TIGER,[tiger >= 0.3.1], [
@@ -2963,7 +2974,7 @@ dnl PKG_ENABLE_MODULES_VLC([GLES2], [], [glesv2], [OpenGL ES v2 support], [auto]
 dnl OpenGL ES 1: depends on EGL 1.0 and is currently broken
 dnl PKG_ENABLE_MODULES_VLC([GLES1], [], [glesv1_cm], [OpenGL ES v1 support], [auto])
 
-AC_ARG_ENABLE(egl,
+VLC_ARG_ENABLE(egl,
   [  --enable-egl            OpenGL support through EGL (default disabled)],, [
   enable_egl="no"
 ])
@@ -2984,7 +2995,7 @@ AC_CHECK_HEADERS(X11/Xlib.h)
 dnl
 dnl  X C Bindings modules
 dnl
-AC_ARG_ENABLE(xcb,
+VLC_ARG_ENABLE(xcb,
   [  --enable-xcb            X11 support with XCB (default enabled)],, [
   AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin" -a "${SYS}" != "symbian"], [
     enable_xcb="yes"
@@ -2992,11 +3003,11 @@ AC_ARG_ENABLE(xcb,
     enable_xcb="no"
   ])
 ])
-AC_ARG_ENABLE(xvideo,
+VLC_ARG_ENABLE(xvideo,
   [  --enable-xvideo         XVideo support (default enabled)],, [
     enable_xvideo="$enable_xcb"
 ])
-AC_ARG_ENABLE(glx,
+VLC_ARG_ENABLE(glx,
   [  --enable-glx            OpenGL support through GLX (default enabled)],, [
   enable_glx="$enable_xcb"
 ])
@@ -3050,9 +3061,9 @@ AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"])
 dnl
 dnl  SDL module
 dnl
-AC_ARG_ENABLE(sdl,
+VLC_ARG_ENABLE(sdl,
   [  --enable-sdl            SDL support (default enabled)])
-AC_ARG_ENABLE(sdl-image,
+VLC_ARG_ENABLE(sdl-image,
   [  --enable-sdl-image      SDL image support (default enabled)])
 if test "${enable_sdl}" != "no"
 then
@@ -3084,7 +3095,7 @@ fi
 
 dnl
 dnl Mac Vout
-AC_ARG_ENABLE(macosx-vout,
+VLC_ARG_ENABLE(macosx-vout,
   [  --enable-macosx-vout    Mac OS X video output module (default enabled on Mac OS X)])
 if test "x${enable_macosx_vout}" != "xno" &&
   (test "${SYS}" = "darwin" || test "${enable_macosx_vout}" = "yes")
@@ -3098,11 +3109,11 @@ fi
 dnl
 dnl  freetype module
 dnl
-AC_ARG_ENABLE(freetype,
+VLC_ARG_ENABLE(freetype,
   [  --enable-freetype       freetype support   (default auto)])
-AC_ARG_ENABLE(fribidi,
+VLC_ARG_ENABLE(fribidi,
   [  --enable-fribidi        fribidi support    (default auto)])
-AC_ARG_ENABLE(fontconfig,
+VLC_ARG_ENABLE(fontconfig,
   [  --enable-fontconfig     fontconfig support (default auto)])
 
 if test "${enable_freetype}" != "no"; then
@@ -3150,7 +3161,7 @@ fi
 dnl
 dnl  QuartzText vout module (iOS/Mac OS)
 dnl
-AC_ARG_ENABLE(macosx-quartztext,
+VLC_ARG_ENABLE(macosx-quartztext,
   [  --enable-macosx-quartztext   Mac OS X quartz text module (default enabled on Mac OS X)])
 if test "x${enable_macosx_quartztext}" != "xno" &&
   (test "${SYS}" = "darwin" || test "${enable_macosx_quartztext}" = "yes")
@@ -3167,7 +3178,7 @@ PKG_ENABLE_MODULES_VLC([SVG], [], [librsvg-2.0 >= 2.9.0], [SVG rendering library
 dnl
 dnl  android surface module
 dnl
-AC_ARG_ENABLE(android-surface,
+VLC_ARG_ENABLE(android-surface,
   [  --enable-android-surface   Android Surface video output module (default disabled)])
 if test "${enable_android_surface}" = "yes"; then
   if test "${HAVE_ANDROID}" = "1"; then
@@ -3180,7 +3191,7 @@ fi
 dnl
 dnl  iOS vout module
 dnl
-AC_ARG_ENABLE(ios-vout,
+VLC_ARG_ENABLE(ios-vout,
   [  --enable-ios-vout    iOS video output module (default disabled)])
 if test "${enable_ios_vout}" = "yes"
 then
@@ -3198,7 +3209,7 @@ then
   VLC_ADD_PLUGIN([panoramix])
 fi
 
-AC_ARG_ENABLE(directx,
+VLC_ARG_ENABLE(directx,
   [  --enable-directx        Win32 DirectX support (default enabled on Win32)])
 if test "${enable_directx}" != "no"; then
   if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then
@@ -3230,7 +3241,7 @@ fi
 dnl
 dnl  Windows Direct2D plugin
 dnl
-AC_ARG_ENABLE(direct2d,
+VLC_ARG_ENABLE(direct2d,
   [  --enable-direct2d       Win7/VistaPU Direct2D support (default auto on Win32)],, [
   AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [
     enable_direct2d="no"
@@ -3248,7 +3259,7 @@ AS_IF([test "${enable_direct2d}" != "no"], [
 dnl
 dnl  win32 GDI plugin
 dnl
-AC_ARG_ENABLE(wingdi,
+VLC_ARG_ENABLE(wingdi,
   [  --enable-wingdi         Win32 GDI module (default enabled on Win32)])
 if test "${enable_wingdi}" != "no"; then
   if test "${SYS}" = "mingw32"; then
@@ -3276,7 +3287,7 @@ dnl  DirectFB module
 dnl  try to find using: 1 - given location; 2 - directfb-config; 3 - pkg-config
 dnl  TODO: support for static linking
 dnl
-AC_ARG_ENABLE(directfb,
+VLC_ARG_ENABLE(directfb,
   [  --enable-directfb       DirectFB support (default disabled)])
 AC_ARG_WITH(directfb,
   [  --with-directfb=PATH    path to DirectFB headers and libraries])
@@ -3338,7 +3349,7 @@ fi
 dnl
 dnl  AA plugin
 dnl
-AC_ARG_ENABLE(aa,
+VLC_ARG_ENABLE(aa,
   [  --enable-aa             aalib output (default disabled)])
 if test "${enable_aa}" = "yes"
 then
@@ -3361,7 +3372,7 @@ PKG_ENABLE_MODULES_VLC([CACA], [], [caca >= 0.99.beta14], [libcaca output],[auto
 dnl
 dnl  OS/2 KVA plugin
 dnl
-AC_ARG_ENABLE(kva,
+VLC_ARG_ENABLE(kva,
   [AS_HELP_STRING([--enable-kva],
     [support the K Video Accelerator KVA (default enabled on OS/2)])],, [
   AS_IF([test "$SYS" = "os2"], [
@@ -3390,7 +3401,7 @@ EXTEND_HELP_STRING([Audio plugins:])
 dnl
 dnl  Pulseaudio module
 dnl
-AC_ARG_ENABLE(pulse,
+VLC_ARG_ENABLE(pulse,
   [AS_HELP_STRING([--enable-pulse],
     [use the PulseAudio client library (default auto)])])
 have_pulse="no"
@@ -3420,7 +3431,7 @@ AM_CONDITIONAL([HAVE_PULSE], [test "${have_pulse}" = "yes"])
 dnl
 dnl  ALSA module
 dnl
-AC_ARG_ENABLE(alsa,
+VLC_ARG_ENABLE(alsa,
   [AS_HELP_STRING([--enable-alsa],
     [support the Advanced Linux Sound Architecture (default auto)])],, [
   AS_IF([test "$SYS" = "linux" -a "${have_pulse}" = "no"], [
@@ -3442,7 +3453,7 @@ AM_CONDITIONAL([HAVE_ALSA], [test "${have_alsa}" = "yes"])
 dnl
 dnl  Open Sound System module
 dnl
-AC_ARG_ENABLE(oss,
+VLC_ARG_ENABLE(oss,
   [AS_HELP_STRING([--enable-oss],
     [support the Open Sound System OSS (default enabled on BSD)])],, [
   AS_IF([test "$SYS" = "mingw32" -o "$SYS" = "mingwce" -o "$SYS" = "linux"], [
@@ -3470,7 +3481,7 @@ PKG_ENABLE_MODULES_VLC([PORTAUDIO], [], [portaudio-2.0], [Portaudio library supp
 dnl
 dnl  win32 waveOut plugin
 dnl
-AC_ARG_ENABLE(waveout,
+VLC_ARG_ENABLE(waveout,
   [  --enable-waveout        Win32 waveOut module (default enabled on Win32)])
 if test "${enable_waveout}" != "no"; then
   if test "${SYS}" = "mingw32"; then
@@ -3485,7 +3496,7 @@ fi
 dnl
 dnl  CoreAudio plugin
 dnl
-AC_ARG_ENABLE(macosx-audio,
+VLC_ARG_ENABLE(macosx-audio,
   [  --enable-macosx-audio   Mac OS X audio module (default enabled on MacOS X)])
 if test "x${enable_macosx_audio}" != "xno" &&
   (test "${SYS}" = "darwin" || test "${enable_macosx_audio}" = "yes")
@@ -3499,7 +3510,7 @@ fi
 dnl
 dnl  AudioQueue plugin
 dnl
-AC_ARG_ENABLE(audioqueue,
+VLC_ARG_ENABLE(audioqueue,
   [  --enable-audioqueue     AudioQueue audio module (default disabled)])
 if test "${enable_audioqueue}" = "yes"
 then
@@ -3515,7 +3526,7 @@ PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modul
 dnl
 dnl  OpenSLES Android
 dnl
-AC_ARG_ENABLE(opensles,
+VLC_ARG_ENABLE(opensles,
   [  --enable-opensles       Android OpenSL ES audio module (default disabled)])
 if test "${HAVE_ANDROID}" = "1"; then
   if test "${enable_opensles}" = "yes"; then
@@ -3533,7 +3544,7 @@ PKG_ENABLE_MODULES_VLC([SAMPLERATE], [], [samplerate], [Resampler with libsample
 dnl
 dnl  OS/2 KAI plugin
 dnl
-AC_ARG_ENABLE(kai,
+VLC_ARG_ENABLE(kai,
   [AS_HELP_STRING([--enable-kai],
     [support the K Audio Interface KAI (default enabled on OS/2)])],, [
   AS_IF([test "$SYS" = "os2"], [
@@ -3562,7 +3573,7 @@ EXTEND_HELP_STRING([Interface plugins:])
 dnl
 dnl Hildon UI
 dnl
-AC_ARG_ENABLE(hildon,
+VLC_ARG_ENABLE(hildon,
   [  --enable-hildon         Hildon touchscreen UI (default disabled)])
 AS_IF([test "${enable_hildon}" = "yes"], [
   PKG_CHECK_MODULES(HILDON, [hildon-1], [
@@ -3588,7 +3599,7 @@ AM_CONDITIONAL(BUILD_HILDON, [test "${enable_hildon}" = "yes"])
 dnl
 dnl QT 4
 dnl
-AC_ARG_ENABLE(qt4,
+VLC_ARG_ENABLE(qt4,
   [  --enable-qt4            Qt 4 support (default enabled) ],, [
   AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no])
 ])
@@ -3655,7 +3666,7 @@ AS_IF([test "x$enable_qt4" = "xno"], [
 dnl
 dnl Skins2 module
 dnl
-AC_ARG_ENABLE(skins2,
+VLC_ARG_ENABLE(skins2,
   [AS_HELP_STRING([--enable-skins2], [skins interface module (default auto)])])
 AS_IF([test "${enable_skins2}" != "no"], [
   have_skins_deps="yes"
@@ -3700,7 +3711,7 @@ AS_IF([test "${enable_skins2}" != "no"], [
 ])
 AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"])
 
-AC_ARG_ENABLE(libtar,
+VLC_ARG_ENABLE(libtar,
   [  --enable-libtar         libtar support for skins2 (default auto)])
 AS_IF([test "${enable_skins2}" = "yes" && test "${enable_libtar}" != "no"], [
   AC_CHECK_HEADERS(libtar.h, [
@@ -3711,7 +3722,7 @@ AS_IF([test "${enable_skins2}" = "yes" && test "${enable_libtar}" != "no"], [
 dnl
 dnl  MacOS X gui module
 dnl
-AC_ARG_ENABLE(macosx,
+VLC_ARG_ENABLE(macosx,
   [  --enable-macosx         Mac OS X gui support (default enabled on Mac OS X)])
 if test "x${enable_macosx}" != "xno" -a "${SYS}" = "darwin"
 then
@@ -3740,7 +3751,7 @@ fi
 dnl
 dnl  MacOS X dialor provider
 dnl
-AC_ARG_ENABLE(macosx-dialog-provider,
+VLC_ARG_ENABLE(macosx-dialog-provider,
   [  --enable-macosx-dialog-provider Mac OS X dialog module (default enabled on Mac OS X)])
 if test "x${enable_macosx_dialog_provider}" != "xno" &&
   (test "${SYS}" = "darwin" || test "${enable_macosx_dialog_provider}" = "yes")
@@ -3752,7 +3763,7 @@ fi
 dnl
 dnl  ncurses module
 dnl
-AC_ARG_ENABLE(ncurses,
+VLC_ARG_ENABLE(ncurses,
 [AS_HELP_STRING([--disable-ncurses],[ncurses text-based interface (default auto)])])
 if test "${enable_ncurses}" != "no"; then
   VLC_SAVE_FLAGS
@@ -3778,7 +3789,7 @@ fi
 dnl
 dnl  XOSD plugin
 dnl
-AC_ARG_ENABLE(xosd,
+VLC_ARG_ENABLE(xosd,
   [  --enable-xosd           xosd interface support (default disabled)])
 if test "${enable_xosd}" = "yes"
 then
@@ -3793,7 +3804,7 @@ fi
 dnl
 dnl Framebuffer (overlay) plugin
 dnl
-AC_ARG_ENABLE(fbosd,
+VLC_ARG_ENABLE(fbosd,
   [  --enable-fbosd          fbosd interface support (default disabled)])
 if test "${enable_fbosd}" = "yes"
 then
@@ -3805,7 +3816,7 @@ fi
 dnl
 dnl  Lirc plugin
 dnl
-AC_ARG_ENABLE(lirc,
+VLC_ARG_ENABLE(lirc,
   [  --enable-lirc           lirc support (default disabled)])
 if test "${enable_lirc}" = "yes"
 then
@@ -3821,7 +3832,7 @@ EXTEND_HELP_STRING([Visualisations and Video filter plugins:])
 dnl
 dnl Visualisation plugin
 dnl
-AC_ARG_ENABLE(visual,
+VLC_ARG_ENABLE(visual,
   [  --enable-visual         visualisation plugin (default enabled)])
 if test "${enable_visual}" != "no"
 then
@@ -3836,7 +3847,7 @@ PKG_ENABLE_MODULES_VLC([GOOM], [], [libgoom2], [goom visualization plugin], [aut
 dnl
 dnl libprojectM visualization plugin
 dnl
-AC_ARG_ENABLE(projectm,
+VLC_ARG_ENABLE(projectm,
   [  --enable-projectm       projectM visualization plugin (default enabled)])
 AS_IF([test "${enable_projectm}" != "no"],
   [
@@ -3857,7 +3868,7 @@ AS_IF([test "${enable_projectm}" != "no"],
 dnl
 dnl  AtmoLight (homemade Philips Ambilight clone)
 dnl
-AC_ARG_ENABLE(atmo,
+VLC_ARG_ENABLE(atmo,
 AS_HELP_STRING([--disable-atmo],[AtmoLight (homemade Philips Ambilight clone)
                 (default enabled)]),, [enable_atmo="yes"])
 AS_IF([test "${enable_atmo}" != no], [
@@ -3898,7 +3909,7 @@ PKG_ENABLE_MODULES_VLC([LIBXML2], [xml], [libxml-2.0 >= 2.5], [libxml2 support],
 dnl
 dnl libgcrypt
 dnl
-AC_ARG_ENABLE(libgcrypt,
+VLC_ARG_ENABLE(libgcrypt,
   [  --disable-libgcrypt     gcrypt support (default enabled)])
 AS_IF([test "${enable_libgcrypt}" != "no"], [
   AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [
@@ -3924,7 +3935,7 @@ AM_CONDITIONAL([HAVE_GCRYPT], [test "${have_libgcrypt}" = "yes"])
 dnl
 dnl TLS/SSL
 dnl
-AC_ARG_ENABLE(gnutls,
+VLC_ARG_ENABLE(gnutls,
   [  --enable-gnutls         GNU TLS TLS/SSL support (default enabled)])
 
 AS_IF([test "${have_libgcrypt}" != "yes"], [
@@ -3958,7 +3969,7 @@ AS_IF([test -f "/etc/maemo_version"], [
 dnl
 dnl Taglib plugin
 dnl
-AC_ARG_ENABLE(taglib,
+VLC_ARG_ENABLE(taglib,
   [AS_HELP_STRING([--disable-taglib],
     [do not use TagLib (default enabled)])])
 AS_IF([test "${enable_taglib}" != "no"], [
@@ -3974,7 +3985,7 @@ AS_IF([test "${enable_taglib}" != "no"], [
 dnl
 dnl update checking system
 dnl
-AC_ARG_ENABLE(update-check,
+VLC_ARG_ENABLE(update-check,
   [  --enable-update-check   update checking system (default disabled)])
 if test "${enable_update_check}" = "yes"
 then
@@ -3990,7 +4001,7 @@ fi
 dnl
 dnl Growl notification plugin
 dnl
-AC_ARG_ENABLE(growl,
+VLC_ARG_ENABLE(growl,
   [  --enable-growl          growl notification plugin (default disabled)],,
   [enable_growl=no])
 AS_IF([test "${enable_growl}" != "no"], [
@@ -4011,7 +4022,7 @@ PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify gtk+-2.0], [libnotify notificati
 dnl
 dnl media library
 dnl
-AC_ARG_ENABLE(media-library,
+VLC_ARG_ENABLE(media-library,
     [  --enable-media-library  media library (default disabled)])
 AS_IF([test "${enable_media_library}" = "yes"], [
   AC_DEFINE([MEDIA_LIBRARY], 1, [Define if you want to use the VLC media library])
@@ -4080,7 +4091,7 @@ dnl
 dnl  DLL loader copied from MPlayer copied from somewhere else (WINE ?)
 dnl
 loader=false
-AC_ARG_ENABLE(loader,
+VLC_ARG_ENABLE(loader,
   AS_HELP_STRING([--enable-loader],[build DLL loader for ELF i386 platforms
           (default disabled)]))
 AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
@@ -4097,11 +4108,11 @@ EXTEND_HELP_STRING([Components:])
 dnl
 dnl  the VLC binary
 dnl
-AC_ARG_ENABLE(vlc,
+VLC_ARG_ENABLE(vlc,
   [  --enable-vlc            build the VLC media player (default enabled)])
 AM_CONDITIONAL(BUILD_VLC, [test "${enable_vlc}" != "no"])
 
-AC_ARG_ENABLE(macosx-vlc-app,
+VLC_ARG_ENABLE(macosx-vlc-app,
   [  --enable-macosx-vlc-app build the VLC media player (default enabled on Mac OS X)])
 AM_CONDITIONAL(BUILD_MACOSX_VLC_APP, [test "${enable_macosx_vlc_app}" != "no" &&
     (test "${SYS}" = "darwin" || test "${enable_macosx_vlc_app}" = "yes") ])
diff --git a/m4/with_pkg.m4 b/m4/with_pkg.m4
index 340c695..5369d1c 100644
--- a/m4/with_pkg.m4
+++ b/m4/with_pkg.m4
@@ -60,7 +60,7 @@ m4_case(def_arg,
             [yes],[m4_pushdef([with_without], [--disable-]with_arg)],
             [m4_pushdef([with_without],[--enable-]with_arg)])
 
-AC_ARG_ENABLE(with_arg,
+VLC_ARG_ENABLE(with_arg,
      AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
     [AS_TR_SH([enable_]with_arg)=def_arg])
 
-- 
1.7.5.1




More information about the vlc-devel mailing list