Configure: build skins2 when asked

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index a520c68456df13a96ea8443440b93f022a965a54..a08d8429f94a1cdb536bccd89a57ee01ba39db6b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1813,19 +1813,6 @@ dnl dvdread module: check for libdvdread
 dnl
 PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread], [dvdread input module], [auto])
 
-dnl libdvdcss
-darwin_libdvdcss_extralibs="-Wl,-framework,CoreFoundation -Wl,-framework,IOKit"
-libdvdcss_extralibs=""
-test "${SYS}" = darwin && libdvdcss_extralibs="${darwin_libdvdcss_extralibs}"
-AC_CHECK_LIB(dvdcss, dvdcss_interface_2, [
-    VLC_ADD_LIBS([dvdread], [-ldvdcss])
-    VLC_ADD_LIBS([dvdnav], [-ldvdcss])
-    if test "${SYS}" = darwin; then
-        VLC_ADD_LIBS([dvdread], "${darwin_libdvdcss_extralibs}")
-        VLC_ADD_LIBS([dvdnav], "${darwin_libdvdcss_extralibs}")
-    fi
-    ],, "${darwin_libdvdcss_extralibs}")
-
 dnl
 dnl libdvdnav plugin
 dnl
@@ -2109,7 +2096,7 @@ then
   VLC_ADD_PLUGIN([qtcapture])
   VLC_ADD_PLUGIN([qtsound])
 fi
-AM_CONDITIONAL(HAVE_QTKIT, [test "${SYS}" = "darwin" && "x${enable_macosx_qtkit}" != "xno"])
+AM_CONDITIONAL(HAVE_QTKIT, [test "${SYS}" = "darwin" -a "x${enable_macosx_qtkit}" != "xno"])
 
 
 dnl
@@ -3643,16 +3630,18 @@ AC_ARG_ENABLE(skins2,
   [AS_HELP_STRING([--enable-skins2], [skins interface module (default auto)])])
 AS_IF([test "${enable_skins2}" != "no"], [
   have_skins_deps="yes"
+
+  dnl Win32
   AS_IF([test "${SYS}" = "mingw32"], [
     VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS])
     VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
     VLC_ADD_LIBS([skins2],[-lgdi32 -lole32 -luuid -lmsimg32])
-
+  dnl MacOS
   ], [test "${SYS}" = "darwin"], [
     VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS])
     VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
     VLC_ADD_LIBS([skins2],[-Wl,-framework,Carbon])
-
+  dnl Linux/Unix
   ], [
     PKG_CHECK_MODULES([XPM], [xpm],, [have_skins_deps="no"])
     PKG_CHECK_MODULES([XINERAMA], [xinerama],, [have_skins_deps="no"])
@@ -3660,8 +3649,9 @@ AS_IF([test "${enable_skins2}" != "no"], [
     VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} ${XEXT_CFLAGS} ${XPM_CFLAGS} -DX11_SKINS])
     VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
     VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} ${XINERAMA_LIBS} -lX11])
-
   ])
+
+  dnl we need freetype
   AS_IF([test "${have_freetype}" != "yes"], [
     have_skins_deps="no"
   ])
@@ -3676,6 +3666,7 @@ AS_IF([test "${enable_skins2}" != "no"], [
   ], [
     VLC_ADD_PLUGIN([skins2])
     ALIASES="${ALIASES} svlc"
+    enable_skins2="yes"
   ])
 ])
 AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"])
@@ -3987,11 +3978,6 @@ AS_IF([test "${enable_libgcrypt}" != "no"], [
   )
 ])
 
-if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then
-  AS_IF([test "${have_libgcrypt}" = "yes"],[
-    VLC_ADD_LIBS([rtp stream_out_rtp], [${GCRYPT_LIBS}])
-  ])
-fi
 AC_SUBST(GCRYPT_CFLAGS)
 AC_SUBST(GCRYPT_LIBS)
 AM_CONDITIONAL([HAVE_GCRYPT], [test "${have_libgcrypt}" = "yes"])
@@ -4011,14 +3997,6 @@ AS_IF([test "${have_libgcrypt}" != "yes"], [
 AS_IF([test "${enable_gnutls}" != "no"], [
   PKG_CHECK_MODULES(GNUTLS, [gnutls >= 2.0.0], [
     VLC_ADD_PLUGIN([gnutls])
-    VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS])
-    AS_IF([test "${SYS}" = "mingw32"], [
-      dnl pkg-config --libs gnutls omits these
-      VLC_ADD_LIBS([gnutls], [-lz ${LTLIBINTL} -lcrypt32])
-    ])
-    VLC_ADD_LIBS([gnutls], [${GCRYPT_LIBS}])
-    VLC_ADD_CFLAGS([gnutls], [${GCRYPT_CFLAGS}])
-    VLC_ADD_LIBS([gnutls], [$GNUTLS_LIBS])
   ], [
     AS_IF([test -n "${enable_gnutls}"], [
       AC_MSG_ERROR([${GNUTLS_PKG_ERRORS}.)])
@@ -4027,36 +4005,6 @@ AS_IF([test "${enable_gnutls}" != "no"], [
 ])
 
 
-dnl
-dnl RemoteOSD plugin (VNC client as video filter)
-dnl
-AC_MSG_CHECKING([whether to enable the RemoteOSD plugin])
-AS_IF([test "${have_libgcrypt}" = "yes"],[
-  AC_MSG_RESULT(yes)
-  VLC_ADD_PLUGIN([remoteosd])
-  VLC_ADD_LIBS([remoteosd], ${GCRYPT_LIBS})
-  VLC_ADD_CFLAGS([remoteosd], ${GCRYPT_CFLAGS})
-], [
-  AC_MSG_RESULT(no)
-  AC_MSG_WARN([libgcrypt support required for RemoteOSD plugin])
-])
-
-
-dnl
-dnl RAOP plugin
-dnl
-AC_MSG_CHECKING([whether to enable the RAOP plugin])
-AS_IF([test "${have_libgcrypt}" = "yes"], [
-  AC_MSG_RESULT(yes)
-  VLC_ADD_PLUGIN([stream_out_raop])
-  VLC_ADD_LIBS([stream_out_raop], [${GCRYPT_LIBS} -lgpg-error])
-  VLC_ADD_CFLAGS([stream_out_raop], [${GCRYPT_CFLAGS}])
-], [
-  AC_MSG_RESULT(no)
-  AC_MSG_WARN([libgcrypt support required for RAOP plugin])
-])
-
-
 dnl
 dnl Nokia MCE plugin (Maemo screen unblanking)
 dnl