X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=configure.ac;h=d6a1f6a3a085a89ddf77eb85e6fa90b0a25615ff;hp=ab3b786502f1dbff3c5f292bb3d8ea814fa2f065;hb=af8e3693a29957c492b9f8f335e6d7cd106032b0;hpb=1743f5e172cd8815a5a9d687ead3cd051e681ea3

diff --git a/configure.ac b/configure.ac
index ab3b786..d6a1f6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,12 @@ TUXBOX_APPS_DVB
 AM_CONDITIONAL(HAVE_GIT_DIR, test -d "$srcdir/.git")
 AM_CONDITIONAL(HAVE_FAKE_GIT_DIR, test -f "$srcdir/.git/last_commit_info")
 
-PKG_CHECK_MODULES(BASE, [freetype2 fribidi gstreamer-0.10 gstreamer-pbutils-0.10 libdvbsi++ libpng libxml-2.0 sigc++-1.2])
+dnl versions of gstreamer and plugins-base
+AC_ARG_WITH(gstversion,
+        AS_HELP_STRING([--with-gstversion],[use gstreamer version (major.minor)]),
+        [GST_MAJORMINOR=$withval],[GST_MAJORMINOR=0.10])
+
+PKG_CHECK_MODULES(BASE, [freetype2 fribidi gstreamer-$GST_MAJORMINOR gstreamer-pbutils-$GST_MAJORMINOR libdvbsi++ libpng libxml-2.0 sigc++-1.2 libssl libcrypto])
 PKG_CHECK_MODULES(LIBDDVD, libdreamdvd, HAVE_LIBDDVD="yes", HAVE_LIBDDVD="no")
 AM_CONDITIONAL(HAVE_LIBDDVD, test "$HAVE_LIBDDVD" = "yes")
 
@@ -65,6 +70,15 @@ if test x"$setrighthalfvfdskin" != xno ; then
 fi
 AM_CONDITIONAL(SET_RIGHT_HALF_VFD_SKIN, test x"$setrighthalfvfdskin" != xno)
 
+AC_ARG_WITH(libvugles2,
+	AS_HELP_STRING([--with-libvugles2],[use libvugles2, yes or no]),
+	[with_libvugles2=$withval],[with_libvugles2=no])
+if test "$with_libvugles2" = "yes"; then
+	PKG_CHECK_MODULES(LIBVUGLES2, [libvugles2])
+	GLES_CFLAGS="-DUSE_LIBVUGLES2"
+fi
+AM_CONDITIONAL(HAVE_LIBVUGLES2, test "$with_libvugles2" = "yes")
+
 AC_ARG_WITH(libsdl,
 	AS_HELP_STRING([--with-libsdl],[use libsdl, yes or no]),
 	[with_libsdl=$withval],[with_libsdl=no])
@@ -116,7 +130,7 @@ AC_SUBST(ENIGMA2_CFLAGS)
 
 CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
 CFLAGS="$CFLAGS $DEBUG_CFLAGS -Wall"
-CXXFLAGS="$CXXFLAGS $DEBUG_CFLAGS -Wall $BASE_CFLAGS $ENIGMA2_CFLAGS $PTHREAD_CFLAGS"
+CXXFLAGS="$CXXFLAGS $DEBUG_CFLAGS -Wall $BASE_CFLAGS $ENIGMA2_CFLAGS $PTHREAD_CFLAGS $GLES_CFLAGS"
 
 AC_CONFIG_FILES([
 Makefile
@@ -134,6 +148,7 @@ data/skin_default/menu/Makefile
 data/skin_default/icons/Makefile
 data/skin_default/buttons/Makefile
 data/skin_default/spinner/Makefile
+data/rc/Makefile
 include/Makefile
 lib/Makefile
 lib/actions/Makefile
@@ -184,8 +199,6 @@ lib/python/Plugins/Extensions/WebBrowser/Makefile
 lib/python/Plugins/Extensions/WebBrowser/meta/Makefile
 lib/python/Plugins/Extensions/WebBrowser/keymap/Makefile
 lib/python/Plugins/Extensions/WebBrowser/desc/Makefile
-lib/python/Plugins/Extensions/VuplusEvent/Makefile
-lib/python/Plugins/Extensions/VuplusEvent/meta/Makefile
 lib/python/Plugins/Extensions/StreamTV/Makefile
 lib/python/Plugins/Extensions/StreamTV/meta/Makefile
 lib/python/Plugins/Extensions/StreamTV/icons/Makefile
@@ -193,6 +206,18 @@ lib/python/Plugins/Extensions/DLNAServer/Makefile
 lib/python/Plugins/Extensions/DLNAServer/meta/Makefile
 lib/python/Plugins/Extensions/DLNABrowser/Makefile
 lib/python/Plugins/Extensions/DLNABrowser/meta/Makefile
+lib/python/Plugins/Extensions/HbbTV/Makefile
+lib/python/Plugins/Extensions/HbbTV/meta/Makefile
+lib/python/Plugins/Extensions/HbbTV/locale/Makefile
+lib/python/Plugins/Extensions/BackupSuiteHDD/Makefile
+lib/python/Plugins/Extensions/BackupSuiteHDD/meta/Makefile
+lib/python/Plugins/Extensions/BackupSuiteHDD/locale/Makefile
+lib/python/Plugins/Extensions/BackupSuiteUSB/Makefile
+lib/python/Plugins/Extensions/BackupSuiteUSB/meta/Makefile
+lib/python/Plugins/Extensions/SatipClient/Makefile
+lib/python/Plugins/Extensions/SatipClient/meta/Makefile
+lib/python/Plugins/Extensions/MiniTV/Makefile
+lib/python/Plugins/Extensions/MiniTV/meta/Makefile
 lib/python/Plugins/SystemPlugins/CleanupWizard/Makefile
 lib/python/Plugins/SystemPlugins/CleanupWizard/meta/Makefile
 lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile
@@ -232,7 +257,6 @@ lib/python/Plugins/SystemPlugins/Videomode/Makefile
 lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile
 lib/python/Plugins/SystemPlugins/WirelessLan/Makefile
 lib/python/Plugins/SystemPlugins/WirelessLan/meta/Makefile
-lib/python/Plugins/SystemPlugins/FactoryTest/Makefile
 lib/python/Plugins/SystemPlugins/Fancontrol/Makefile
 lib/python/Plugins/SystemPlugins/Fancontrol/meta/Makefile
 lib/python/Plugins/SystemPlugins/FPGAUpgrade/Makefile
@@ -265,6 +289,28 @@ lib/python/Plugins/SystemPlugins/WirelessAccessPoint/Makefile
 lib/python/Plugins/SystemPlugins/WirelessAccessPoint/meta/Makefile
 lib/python/Plugins/SystemPlugins/ZappingModeSelection/Makefile
 lib/python/Plugins/SystemPlugins/ZappingModeSelection/meta/Makefile
+lib/python/Plugins/SystemPlugins/DeviceManager/Makefile
+lib/python/Plugins/SystemPlugins/DeviceManager/meta/Makefile
+lib/python/Plugins/SystemPlugins/DeviceManager/locale/Makefile
+lib/python/Plugins/SystemPlugins/TransCodingSetup/Makefile
+lib/python/Plugins/SystemPlugins/TransCodingSetup/meta/Makefile
+lib/python/Plugins/SystemPlugins/TransCodingSetup/locale/Makefile
+lib/python/Plugins/SystemPlugins/WOLSetup/Makefile
+lib/python/Plugins/SystemPlugins/WOLSetup/meta/Makefile
+lib/python/Plugins/SystemPlugins/NetDrive/Makefile
+lib/python/Plugins/SystemPlugins/NetDrive/meta/Makefile
+lib/python/Plugins/SystemPlugins/AudioEffect/Makefile
+lib/python/Plugins/SystemPlugins/AudioEffect/meta/Makefile
+lib/python/Plugins/SystemPlugins/AnimationSetup/Makefile
+lib/python/Plugins/SystemPlugins/AnimationSetup/meta/Makefile
+lib/python/Plugins/SystemPlugins/BoxModeConfig/Makefile
+lib/python/Plugins/SystemPlugins/BoxModeConfig/meta/Makefile
+lib/python/Plugins/SystemPlugins/FastChannelChange/Makefile
+lib/python/Plugins/SystemPlugins/FastChannelChange/meta/Makefile
+lib/python/Plugins/SystemPlugins/PvrDescrambleConvert/Makefile
+lib/python/Plugins/SystemPlugins/PvrDescrambleConvert/meta/Makefile
+lib/python/Plugins/Extensions/QuadPiP/Makefile
+lib/python/Plugins/Extensions/QuadPiP/meta/Makefile
 lib/python/Tools/Makefile
 lib/service/Makefile
 lib/components/Makefile