diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-11-23 21:41:25 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-11-23 21:41:25 +0100 |
| commit | 8683394e33d39fb9d1b5e3726a5a1b5f9b1d3e2c (patch) | |
| tree | 7fa37a5df692308577d091dfc7e3e6073bb13afb | |
| parent | 5138dce8cfa3d4987ebc8899d5fd990883d1a1dc (diff) | |
| parent | 30d08880e13f81aa3aa6cb163e2037d1b98e20e4 (diff) | |
| download | enigma2-8683394e33d39fb9d1b5e3726a5a1b5f9b1d3e2c.tar.gz enigma2-8683394e33d39fb9d1b5e3726a5a1b5f9b1d3e2c.zip | |
Merge branch 'obi/master' into experimental
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am | 3 |
2 files changed, 5 insertions, 2 deletions
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@ |