From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 24 Nov 2010 17:06:03 +0000 (+0100)
Subject: Merge branch 'master' into obi/master
X-Git-Tag: exp-2010.12~13^2
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/01da0bdcc7d4043dbab99ad19443e5860c72da79?hp=ed545659e30ea7796e2e7acd06e766cc82efb486

Merge branch 'master' into obi/master
---

diff --git a/configure.ac b/configure.ac
index 48fea647..605431b9 100644
--- 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 7aaec9bb..3e2ee67c 100644
--- 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@