Qt menus: prefer THEMIM->getInput()

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 541c3269748ff4977776c67d2b8ccb04d0bd13a3..f3d58e51f3f07a52d479284deb3058e74f28bc5f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1665,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
@@ -4730,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"], [
@@ -4766,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
@@ -4804,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
@@ -5181,7 +5199,7 @@ AS_IF([test "${enable_libgcrypt}" != "no"], [
 ])
 if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then
   AS_IF([test "${have_libgcrypt}" = "yes"],[
-    VLC_ADD_LIBS([rtp], [${LIBGCRYPT_LIBS}])
+    VLC_ADD_LIBS([rtp stream_out_rtp], [${LIBGCRYPT_LIBS}])
   ])
 fi
 AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"])
@@ -5316,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]) ]
       )],