X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=7aecb5a65bdb1486ecfb4c456c005248f36775d1;hb=74e39ff5c2338562f55aba264ac70ed7f1b43e85;hp=5bcacb1bdbfa1bcceec45557c530cd608b582cfc;hpb=d9421a57fca120c70c5980d5f4e69e9fa2c7324b;p=vlc

diff --git a/configure.ac b/configure.ac
index 5bcacb1bdb..7aecb5a65b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1254,7 +1254,7 @@ dnl  Check for fully working MMX intrinsics
 dnl  We need support for -mmmx, we need <mmintrin.h>, and we also need a
 dnl  working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963)
 AC_ARG_ENABLE(mmx,
-[  --disable-mmx       disable MMX optimizations (default auto)],,[
+[  --disable-mmx           disable MMX optimizations (default auto)],,[
   case "${host_cpu}" in
     i?86|x86_64)
       enable_mmx="yes"
@@ -1321,7 +1321,8 @@ dnl  Check for fully workin SSE2 intrinsics
 dnl  We need support for -mmmx, we need <emmintrin.h>, and we also need a
 dnl  working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963)
 AC_ARG_ENABLE(sse,
-[  --disable-sse       disable SSE (1 and 2) optimizations (default auto)],, [
+[  --disable-sse           disable SSE (1 and 2) optimizations (default auto)]
+,, [
   case "${host_cpu}" in
     i686|x86_64)
       enable_sse=yes
@@ -1664,6 +1665,21 @@ then
 fi
 AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
 
+dnl
+dnl libproxy support
+dnl
+AC_ARG_ENABLE(libproxy,
+  [  --enable-libproxy       libproxy support (default auto)])
+AS_IF([test "${enable_libproxy}" != "no"], [
+  AC_CHECK_HEADERS(proxy.h, [
+    VLC_ADD_LIBS([access_http],[-lproxy])
+  ], [
+    AS_IF([test "x${enable_libproxy}" != "x"], [
+      AC_MSG_ERROR([libproxy could not be found on your system])
+    ])
+  ])
+])
+
 dnl
 dnl VideoLAN manager
 dnl
@@ -2887,7 +2903,7 @@ dnl
 dnl   libid3tag support (FIXME!!! doesn't work with new input)
 dnl
 AC_ARG_ENABLE( id3tag,
-  [  --disable-id3tag id3tag metadata reader plugin (default enabled)])
+[  --disable-id3tag        id3tag metadata reader plugin (default enabled)])
 AS_IF([test "${enable_id3tag}" != "no"], [
   AC_CHECK_HEADERS(id3tag.h, [
     AC_CHECK_HEADERS(zlib.h, [
@@ -2902,7 +2918,7 @@ dnl  avcodec decoder/encoder plugin
 dnl
 
 AC_ARG_ENABLE(avcodec,
-[  --enable-avcodec	   libavcodec codec (default enabled)])
+[  --enable-avcodec        libavcodec codec (default enabled)])
 if test "${enable_avcodec}" != "no"
 then
   PKG_CHECK_MODULES(AVCODEC,[libavcodec libavutil],
@@ -2926,7 +2942,7 @@ dnl  avformat demuxer/muxer plugin
 dnl
 
 AC_ARG_ENABLE(avformat,
-[  --enable-avformat   libavformat containers (default enabled)])
+[  --enable-avformat       libavformat containers (default enabled)])
 if test "${enable_avformat}" != "no"
 then
   PKG_CHECK_MODULES(AVFORMAT,[libavformat libavutil],
@@ -2950,7 +2966,7 @@ dnl  swscale image scaling and conversion plugin
 dnl
 
 AC_ARG_ENABLE(swscale,
-[  --enable-swscale    libswscale image scaling and conversion (default enabled)])
+[  --enable-swscale        libswscale image scaling and conversion (default enabled)])
 if test "${enable_swscale}" != "no"
 then
   PKG_CHECK_MODULES(SWSCALE,[libswscale],
@@ -2978,7 +2994,7 @@ dnl  from VLC.
 dnl
 
 AC_ARG_ENABLE(imgresample,
-[  --enable-imgresample deprecated libavcodec image scaling and conversion (default disabled)])
+[  --enable-imgresample    deprecated libavcodec image scaling and conversion (default disabled)])
 if test "${enable_imgresample}" = "yes"
 then
   PKG_CHECK_MODULES(IMGRESAMPLE,[libavcodec],
@@ -3014,7 +3030,7 @@ dnl  postproc plugin
 dnl
 
 AC_ARG_ENABLE(postproc,
-[  --enable-postproc   libpostproc image post-processing (default enabled)])
+[  --enable-postproc       libpostproc image post-processing (default enabled)])
 if test "${enable_postproc}" != "no"
 then
   PKG_CHECK_MODULES(POSTPROC,[libpostproc libavutil],
@@ -3686,7 +3702,7 @@ dnl
 dnl asa/csri subtitle rendering module
 dnl
 AC_ARG_ENABLE(csri,
-  [  --enable-csri          Subtitle support using CSRI / asa (default disabled)])
+  [  --enable-csri           Subtitle support using CSRI / asa (default disabled)])
 AS_IF( [test "${enable_csri}" = "yes"], [
   PKG_CHECK_MODULES(CSRI,
       csri >= 0.1.0,
@@ -3703,7 +3719,7 @@ dnl
 dnl asa demuxer
 dnl
 AC_ARG_ENABLE(asademux,
-  [  --enable-asademux      asa subtitle demuxing (default disabled)])
+  [  --enable-asademux       asa subtitle demuxing (default disabled)])
 AS_IF( [test "${enable_asademux}" = "yes"], [
   PKG_CHECK_MODULES(PCRE,
       libpcre >= 6.5,
@@ -4729,7 +4745,7 @@ dnl
 dnl UPnP Plugin (Intel SDK)
 dnl
 AC_ARG_ENABLE(upnp,
-  [  --enable-upnp           Intel UPnP SDK (default enabled)])
+  [AS_HELP_STRING([--enable-upnp],[Intel UPnP SDK (default enabled)])])
 
 VLC_ADD_CXXFLAGS([upnp_intel], [ ])
 AS_IF([test "x${enable_upnp}" != "xno"], [
@@ -4765,7 +4781,8 @@ dnl
 dnl Skins2 module
 dnl
 AC_ARG_ENABLE(skins2,
-  [  --enable-skins2         Skins2 interface module (default disabled)])
+  [AS_HELP_STRING([--enable-skins2],[Skins2 interface module (default
+   enabled except on MacOSX, BeOS and WinCE)])])
 if test "${enable_skins2}" = "yes" ||
   (test "${SYS}" != "darwin" && test "${SYS}" != "beos" &&
    test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no"); then
@@ -4803,7 +4820,9 @@ if test "${enable_skins2}" = "yes" ||
     VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lX11])
   fi fi fi
 fi
-AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"])
+AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes" ||
+	 (test "${SYS}" != "darwin" && test "${SYS}" != "beos" &&
+	  test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")])
 
 dnl
 dnl  PDA Gtk+2 module
@@ -5127,7 +5146,7 @@ dnl  AtmoLight (homebrew AmbiLight)
 dnl
 if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then
    AC_ARG_ENABLE(atmo,
-[  --disable-atmo	AtmoLight (homebrew philips ambilight) (default enabled)])
+[  --disable-atmo          AtmoLight (homebrew philips ambilight) (default enabled)])
    if test "${enable_atmo}" != "no"; then
       AC_LANG_PUSH(C++)
       VLC_ADD_PLUGIN([atmo])
@@ -5218,7 +5237,7 @@ dnl
 dnl RemoteOSD plugin (VNC client as video filter)
 dnl
 AC_ARG_ENABLE(remoteosd,
-  [  --disable-remoteosd         RemoteOSD plugin (default enabled)])
+  [  --disable-remoteosd     RemoteOSD plugin (default enabled)])
 
 AS_IF([test "${enable_remoteosd}" != "no"], [
   AS_IF([test "${have_libgcrypt}" = "yes"],[
@@ -5315,13 +5334,13 @@ then
           AC_CHECK_HEADERS(objsafe.h,
             VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),,
             [
-	     #if HAVE_OLE2_H
+             #if HAVE_OLE2_H
              #   include <ole2.h>
              #endif
-	     ]
+            ]
           )
           activex=:
-  	  PLUGINS_BINDINGS="${PLUGINS_BINDINGS} activex"
+          PLUGINS_BINDINGS="${PLUGINS_BINDINGS} activex"
         ],
         [ AC_MSG_ERROR([required OLE headers are missing from your system]) ]
       )],