Merge branch 'master' into obi/master

diff --git a/configure.ac b/configure.ac
index 48fea647a6e187e1307000c5fe4b05a34c085cc7..605431b919fb7fcdc18c6020ab2bd0b3552c168c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -86,8 +86,8 @@ 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"])
 AM_CONDITIONAL(UPDATE_PO, test "$with_po" = "yes")
 
 CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
index 7aaec9bb9c96170a6cdf1619f89e2cb56cfc0ea7..3e2ee67cb32a0a6690664ebc9ac95d71f6d42fc9 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
@@ -4,6 +4,8 @@ AM_CPPFLAGS = \
        -include Python.h \
        -include $(top_builddir)/enigma2_config.h
 
+AM_CXXFLAGS = @LIBDDVD_CFLAGS@
+
 plugindir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer
 
 plugin_LTLIBRARIES = servicedvd.la
@@ -13,3 +15,4 @@ servicedvd_la_SOURCES = \
        servicedvd.h
 
 servicedvd_la_LDFLAGS = -avoid-version -module
+servicedvd_la_LIBADD = @LIBDDVD_LIBS@