From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sat, 26 Nov 2011 13:07:47 +0000 (+0100)
Subject: Configure: build skins2 when asked
X-Git-Tag: 1.3.0-git~44
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5f8906ff5ceaef5e05b7c91363fcf30dcff39b15;hp=77e431be6dded7d2f52fdbde15987b168a473433;p=vlc

Configure: build skins2 when asked
---

diff --git a/configure.ac b/configure.ac
index 1c3795100e..a08d8429f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3630,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"])
@@ -3647,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"
   ])
@@ -3663,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"])