X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=configure.ac;h=94654cdb60d62d496f43d73ce734c26c80ff8e60;hp=332fc7a377f45ae1a3a6d067767c55e1f72a8e35;hb=5219d43296787b3592eedba7fd78b54e87638351;hpb=83d2819a49d7182cb8cee41caeb3c20d9187aba5 diff --git a/configure.ac b/configure.ac index 332fc7a..94654cd 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ 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]) +PKG_CHECK_MODULES(BASE, [freetype2 fribidi gstreamer-0.10 gstreamer-pbutils-0.10 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 +65,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 +125,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 @@ -184,8 +193,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 @@ -284,6 +291,8 @@ 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/Tools/Makefile lib/service/Makefile lib/components/Makefile