projects / vuplus_dvbapp / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
DeviceManager : prevent MessageBox crash.
[vuplus_dvbapp] / configure.ac
diff --git a/configure.ac b/configure.ac
index 48fea64..057ded7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([enigma2],[2.8.0],[enigma2-devel@lists.elitedvb.net])
+AC_INIT([enigma2],[3.0.0],[enigma2-devel@lists.elitedvb.net])
 AM_INIT_AUTOMAKE([dist-bzip2 no-define tar-pax -Wno-portability])
 AC_CONFIG_HEADERS([enigma2_config.h])
 
@@ -16,14 +16,7 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AC_CHECK_HEADERS([dbox/fp.h dbox/lcd-ks0713.h])
 
-AC_PATH_PROG(MSGFMT,[msgfmt])
-AC_PATH_PROG(MSGINIT,[msginit])
-AC_PATH_PROG(MSGMERGE,[msgmerge])
-AC_PATH_PROG(MSGUNIQ,[msguniq])
-AC_PATH_PROG(XGETTEXT,[xgettext])
-if test -z "$MSGFMT" -o -z "$MSGINIT" -o -z "$MSGMERGE" -o -z "$MSGUNIQ" -o -z "$XGETTEXT"; then
-       AC_MSG_ERROR([Could not find required gettext tools])
-fi
+AC_PATH_PROG(MSGFMT, msgfmt, AC_MSG_ERROR(Could not find msgfmt))
 
 AM_PATH_PYTHON
 AX_PYTHON_DEVEL
@@ -53,6 +46,25 @@ AC_CHECK_LIB([xmlccwrap], [exit], [LIBXMLCCWRAP_LIBS="-lxmlccwrap"], [AC_MSG_ERR
 AC_SUBST(LIBXMLCCWRAP_LIBS)
 AC_LANG_POP
 
+AC_ARG_WITH(remote-keyboard,
+        AC_HELP_STRING([--with-remote-keyboard], [use remote keyboard on dvbapp, yes or no]),
+        [[withrckbd=$withval]],
+        [[withrckbd=no]]
+)
+if test x"$withrckbd" != xno ; then
+        AC_DEFINE(VUPLUS_USE_RCKBD, 1,[Define when using a rc-keyboard on dvbapp])
+fi
+
+AC_ARG_WITH(set-right-half-vfd-skin,
+        AC_HELP_STRING([--with-set-right-half-vfd-skin], [display right_half_vfd_icons from skin(for ultimo), yes or no]),
+        [[setrighthalfvfdskin=$withval]],
+        [[setrighthalfvfdskin=no]]
+)
+if test x"$setrighthalfvfdskin" != xno ; then
+        AC_DEFINE(SET_RIGHT_HALF_VFD_SKIN, 1,[Define when display right_half_vfd_icons from skin, for ultimo])
+fi
+AM_CONDITIONAL(SET_RIGHT_HALF_VFD_SKIN, test x"$setrighthalfvfdskin" != xno)
+
 AC_ARG_WITH(libsdl,
        AS_HELP_STRING([--with-libsdl],[use libsdl, yes or no]),
        [with_libsdl=$withval],[with_libsdl=no])
@@ -86,12 +98,25 @@ if test "$with_memcheck" = "yes"; then
 fi
 
 AC_ARG_WITH(po,
-       AS_HELP_STRING([--without-po],[disable updating of po files]),
-       [with_po="$withval"],[with_po="yes"])
+       AS_HELP_STRING([--with-po],[enable updating of po files]),
+       [with_po="$withval"],[with_po="no"])
+if test "$with_po" = "yes"; then
+       AC_PATH_PROG(MSGINIT, msginit)
+       AC_PATH_PROG(MSGMERGE, msgmerge)
+       AC_PATH_PROG(MSGUNIQ, msguniq)
+       AC_PATH_PROG(XGETTEXT, xgettext)
+       if test -z "$MSGINIT" -o -z "$MSGMERGE" -o -z "$MSGUNIQ" -o -z "$XGETTEXT"; then
+               AC_MSG_ERROR([Could not find required gettext tools])
+       fi
+fi
 AM_CONDITIONAL(UPDATE_PO, test "$with_po" = "yes")
 
+ENIGMA2_CFLAGS="-fno-rtti -fno-exceptions"
+AC_SUBST(ENIGMA2_CFLAGS)
+
 CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
-CXXFLAGS="$CXXFLAGS $BASE_CFLAGS $PTHREAD_CFLAGS $DEBUG_CFLAGS -fno-rtti -fno-exceptions -Wall"
+CFLAGS="$CFLAGS $DEBUG_CFLAGS -Wall"
+CXXFLAGS="$CXXFLAGS $DEBUG_CFLAGS -Wall $BASE_CFLAGS $ENIGMA2_CFLAGS $PTHREAD_CFLAGS"
 
 AC_CONFIG_FILES([
 Makefile
@@ -155,6 +180,22 @@ lib/python/Plugins/Extensions/SocketMMI/meta/Makefile
 lib/python/Plugins/Extensions/SocketMMI/src/Makefile
 lib/python/Plugins/Extensions/TuxboxPlugins/Makefile
 lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile
+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
+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/SystemPlugins/CleanupWizard/Makefile
 lib/python/Plugins/SystemPlugins/CleanupWizard/meta/Makefile
 lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/Makefile
@@ -194,6 +235,45 @@ 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
+lib/python/Plugins/SystemPlugins/FPGAUpgrade/meta/Makefile
+lib/python/Plugins/SystemPlugins/WirelessLanSetup/Makefile
+lib/python/Plugins/SystemPlugins/WirelessLanSetup/meta/Makefile
+lib/python/Plugins/SystemPlugins/ManualFancontrol/Makefile
+lib/python/Plugins/SystemPlugins/ManualFancontrol/meta/Makefile
+lib/python/Plugins/SystemPlugins/Blindscan/Makefile
+lib/python/Plugins/SystemPlugins/Blindscan/meta/Makefile
+lib/python/Plugins/SystemPlugins/RemoteControlCode/Makefile
+lib/python/Plugins/SystemPlugins/RemoteControlCode/meta/Makefile
+lib/python/Plugins/SystemPlugins/UI3DSetup/Makefile
+lib/python/Plugins/SystemPlugins/UI3DSetup/meta/Makefile
+lib/python/Plugins/SystemPlugins/UIPositionSetup/Makefile
+lib/python/Plugins/SystemPlugins/UIPositionSetup/meta/Makefile
+lib/python/Plugins/SystemPlugins/HDMICEC/Makefile
+lib/python/Plugins/SystemPlugins/HDMICEC/components/Makefile
+lib/python/Plugins/SystemPlugins/HDMICEC/meta/Makefile
+lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/Makefile
+lib/python/Plugins/SystemPlugins/LEDBrightnessSetup/meta/Makefile
+lib/python/Plugins/SystemPlugins/FirmwareUpgrade/Makefile
+lib/python/Plugins/SystemPlugins/FirmwareUpgrade/meta/Makefile
+lib/python/Plugins/SystemPlugins/CrashReport/Makefile
+lib/python/Plugins/SystemPlugins/CrashReport/meta/Makefile
+lib/python/Plugins/SystemPlugins/3GModemManager/Makefile
+lib/python/Plugins/SystemPlugins/3GModemManager/meta/Makefile
+lib/python/Plugins/SystemPlugins/3GModemManager/script/Makefile
+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/Tools/Makefile
 lib/service/Makefile
 lib/components/Makefile
@@ -203,4 +283,5 @@ tools/Makefile
 tools/enigma2.sh
 enigma2.pc
 ])
+AC_DEFINE(BUILD_VUPLUS,1,[Define to 1 for vuplus])
 AC_OUTPUT
Unnamed repository; edit this file 'description' to name the repository.