vlc | branch: master | Rafaël Carré <[email protected]> | Mon Nov 28 23:41:25 2011 -0500| [073fb45a9ef13b68c6f7a2b246107dac34fc0841] | committer: Rafaël Carré
Move skins2 test after qt4 so it can be disabled > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=073fb45a9ef13b68c6f7a2b246107dac34fc0841 --- configure.ac | 112 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 56 insertions(+), 56 deletions(-) diff --git a/configure.ac b/configure.ac index a0bfd9f..c175fe7 100644 --- a/configure.ac +++ b/configure.ac @@ -3564,62 +3564,6 @@ dnl EXTEND_HELP_STRING([Interface plugins:]) dnl -dnl Skins2 module -dnl -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"]) - PKG_CHECK_MODULES([XEXT], [xext],, [have_skins_deps="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" - ]) - - AS_IF([test "${have_skins_deps}" = "no"], [ - AS_IF([test "x${enable_skins2}" = "x"], [ - AC_MSG_WARN([Skins2 interface disabled due to missing dependencies.]) - ], [ - AC_MSG_ERROR([Skins2 interface requires FreeType, libxpm, libxext and libxinerama]) - ]) - enable_skins2="no" - ], [ - VLC_ADD_PLUGIN([skins2]) - ALIASES="${ALIASES} svlc" - enable_skins2="yes" - ]) -]) -AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"]) - -AC_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, [ - VLC_ADD_LIBS([skins2],[-ltar]) - ]) -]) - -dnl dnl Hildon UI dnl AC_ARG_ENABLE(hildon, @@ -3708,6 +3652,62 @@ AS_IF([test "${enable_skins2}" != "no" && test "x$enable_qt4" = "xno"], [ ]) dnl +dnl Skins2 module +dnl +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"]) + PKG_CHECK_MODULES([XEXT], [xext],, [have_skins_deps="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" + ]) + + AS_IF([test "${have_skins_deps}" = "no"], [ + AS_IF([test "x${enable_skins2}" = "x"], [ + AC_MSG_WARN([Skins2 interface disabled due to missing dependencies.]) + ], [ + AC_MSG_ERROR([Skins2 interface requires FreeType, libxpm, libxext and libxinerama]) + ]) + enable_skins2="no" + ], [ + VLC_ADD_PLUGIN([skins2]) + ALIASES="${ALIASES} svlc" + enable_skins2="yes" + ]) +]) +AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"]) + +AC_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, [ + VLC_ADD_LIBS([skins2],[-ltar]) + ]) +]) + +dnl dnl MacOS X gui module dnl AC_ARG_ENABLE(macosx, _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
