fix configure errors. (gettext, pkgconfig, autotools)

14 files changed, 60 insertions, 9 deletions

diff --git a/meta-openvuplus/recipes-connectivity/djmount/djmount_0.71.bb b/meta-openvuplus/recipes-connectivity/djmount/djmount_0.71.bb
index 9dd1cae..101d6da 100644
--- a/meta-openvuplus/recipes-connectivity/djmount/djmount_0.71.bb
+++ b/meta-openvuplus/recipes-connectivity/djmount/djmount_0.71.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 INITSCRIPT_NAME = "djmount"
 INITSCRIPT_PARAMS = "defaults"
 
-inherit autotools 
+inherit autotools pkgconfig gettext
 
 EXTRA_OECONF = "--with-external-libupnp --with-fuse-prefix='${STAGING_LIBDIR}'"
 
diff --git a/meta-openvuplus/recipes-connectivity/fuse/curlftpfs_0.9.2.bb b/meta-openvuplus/recipes-connectivity/fuse/curlftpfs_0.9.2.bb
index d69844d..7fab53f 100644
--- a/meta-openvuplus/recipes-connectivity/fuse/curlftpfs_0.9.2.bb
+++ b/meta-openvuplus/recipes-connectivity/fuse/curlftpfs_0.9.2.bb
@@ -13,7 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/curlftpfs/${P}.tar.gz"
 
 S = "${WORKDIR}/${P}"
 
-inherit autotools
+inherit autotools pkgconfig
 
 SRC_URI[md5sum] = "b452123f755114cd4461d56c648d9f12"
 SRC_URI[sha256sum] = "4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958"
diff --git a/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb b/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb
index dd0498b..0c37c33 100644
--- a/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb
+++ b/meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb
@@ -15,6 +15,10 @@ SRC_URI = "cvs://anonymous@minidlna.cvs.sourceforge.net/cvsroot/minidlna;module=
 
 S = "${WORKDIR}/${PN}"
 
+do_configure_prepend() {
+        sed -i 's/AM_INIT_AUTOMAKE.*$/AM_INIT_AUTOMAKE([foreign subdir-objects])/' ${S}/configure.ac
+}
+
 inherit autotools-brokensep gettext
 
 PACKAGES =+ "${PN}-utils"
diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink_0.10.bb b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink_0.10.bb
index 3ee999d..66d33dd 100644
--- a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink_0.10.bb
+++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink_0.10.bb
@@ -19,6 +19,13 @@ SRC_URI_append_vuplus = " \
                 file://Set-only-by-hardware-supported-audio-mpeg-4-profile.patch \
                 "
 
+S = "${WORKDIR}/git"
+
+do_configure_prepend() {
+        sed -i 's/AC_INIT.*$/AC_INIT(gst-plugin-dreambox-dvbmediasink, 0.10, @openvuplus)/' ${S}/configure.ac
+        sed -i 's/AM_INIT_AUTOMAKE.*$/AM_INIT_AUTOMAKE([foreign subdir-objects])/' ${S}/configure.ac
+}
+
 FILES_${PN} = "${libdir}/gstreamer-0.10/*.so"
 FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
 FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a"
diff --git a/meta-openvuplus/recipes-multimedia/libmusicbrainz/libmusicbrainz_git.bbappend b/meta-openvuplus/recipes-multimedia/libmusicbrainz/libmusicbrainz_git.bbappend
new file mode 100644
index 0000000..8963c1d
--- /dev/null
+++ b/meta-openvuplus/recipes-multimedia/libmusicbrainz/libmusicbrainz_git.bbappend
@@ -0,0 +1,3 @@
+PR .= "-vuplus0"
+
+B = "${S}"
diff --git a/meta-openvuplus/recipes-multimedia/streamripper/streamripper_1.64.6.bb b/meta-openvuplus/recipes-multimedia/streamripper/streamripper_1.64.6.bb
index 4be9d0d..1349414 100644
--- a/meta-openvuplus/recipes-multimedia/streamripper/streamripper_1.64.6.bb
+++ b/meta-openvuplus/recipes-multimedia/streamripper/streamripper_1.64.6.bb
@@ -15,3 +15,8 @@ EXTRA_OECONF = "--disable-oggtest \
 		--with-vorbis=${STAGING_LIBDIR}"
 
 inherit autotools
+
+# Fixup for missing "foreign" and "subdir-objects" in automake
+do_configure_prepend() {
+        sed -i 's/AM_INIT_AUTOMAKE.*$/AM_INIT_AUTOMAKE([foreign subdir-objects])/' ${S}/configure.ac ${S}/*/configure.ac
+}
diff --git a/meta-openvuplus/recipes-support/libxmlccwrap/files/use-pkgconfig.patch b/meta-openvuplus/recipes-support/libxmlccwrap/files/use-pkgconfig.patch
new file mode 100644
index 0000000..cb01fad
--- /dev/null
+++ b/meta-openvuplus/recipes-support/libxmlccwrap/files/use-pkgconfig.patch
@@ -0,0 +1,25 @@
+Index: libxmlccwrap-0.0.12/configure.ac
+===================================================================
+--- libxmlccwrap-0.0.12.orig/configure.ac
++++ libxmlccwrap-0.0.12/configure.ac
+@@ -14,7 +14,7 @@ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ AM_PROG_LIBTOOL
+ 
+-AC_CHECK_LIB(xml2,main)
++PKG_CHECK_MODULES(XML2, [libxml-2.0])
+ #AC_CHECK_LIB(xslt,main)
+ 
+ AC_OUTPUT([Makefile \
+Index: libxmlccwrap-0.0.12/xmlccwrap/Makefile.am
+===================================================================
+--- libxmlccwrap-0.0.12.orig/xmlccwrap/Makefile.am
++++ libxmlccwrap-0.0.12/xmlccwrap/Makefile.am
+@@ -1,6 +1,6 @@
+ lib_LTLIBRARIES = libxmlccwrap.la
+ 
+-INCLUDES = -I$(top_srcdir) `xml2-config --cflags` `xslt-config --cflags`
++AM_CPPFLAGS = -I$(top_srcdir) $(XML2_CFLAGS)
+   
+ libxmlccwrap_la_LDFLAGS = -release $(VERSION)
+ libxmlccwrap_la_SOURCES=xmlccwrap.cc libxmlexport.cc
diff --git a/meta-openvuplus/recipes-support/libxmlccwrap/libxmlccwrap_0.0.12.bb b/meta-openvuplus/recipes-support/libxmlccwrap/libxmlccwrap_0.0.12.bb
index 51b934a..57f2fce 100644
--- a/meta-openvuplus/recipes-support/libxmlccwrap/libxmlccwrap_0.0.12.bb
+++ b/meta-openvuplus/recipes-support/libxmlccwrap/libxmlccwrap_0.0.12.bb
@@ -10,12 +10,14 @@ PR = "r1"
 SRC_URI = "http://www.ant.uni-bremen.de/whomes/rinas/libxmlccwrap/download/${P}.tar.gz \
 	   file://dont_build_unneeded.patch \
 	   file://disable_libxslt.patch \
-	   file://fix_assignment_operator.patch"
+	   file://fix_assignment_operator.patch \
+	   file://use-pkgconfig.patch \
+"
 
 SRC_URI[md5sum] = "9f8bbad3452d704603246273b2dda758"
 SRC_URI[sha256sum] = "38fb5f75f8b7dad1c8d535cc7b18ea9f1603e14a8b9256a2f60cf721513dc299"
 
-inherit autotools
+inherit autotools pkgconfig
 
 FILES_${PN} = "${libdir}/${P}${SOLIBSDEV}"
 FILES_${PN}-dev = "${includedir} ${libdir}/${PN}${SOLIBSDEV} ${libdir}/*.la"
diff --git a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb b/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb
index cb0e4bc..b85183d 100755
--- a/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb
+++ b/meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb
@@ -11,6 +11,6 @@ SRC_URI = " \
 
 S = "${WORKDIR}/git"
 
-inherit autotools git-project
+inherit autotools git-project pkgconfig
 
 
diff --git a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-systemplugins-autoshutdown.bb b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-systemplugins-autoshutdown.bb
index 9581a1e..f19c45a 100644
--- a/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-systemplugins-autoshutdown.bb
+++ b/meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-systemplugins-autoshutdown.bb
@@ -15,7 +15,7 @@ SRC_URI += " \
         file://autoshutdown-fix-standby_20140407.patch \
 "
 
-inherit autotools-brokensep
+inherit autotools-brokensep pkgconfig
 
 FILES_${PN} = "/"
 
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins.bb
index ac97558..9b383b5 100755
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins.bb
@@ -43,7 +43,7 @@ FILES_${PN}-meta = "${datadir}/meta"
 PACKAGES += "${PN}-meta"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit autotools-brokensep pythonnative
+inherit autotools-brokensep pythonnative pkgconfig
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-openvuplus/recipes-vuplus/lcd4linux/lcd4linux_0.11.0-SVN.bb b/meta-openvuplus/recipes-vuplus/lcd4linux/lcd4linux_0.11.0-SVN.bb
index ee67796..675802a 100644
--- a/meta-openvuplus/recipes-vuplus/lcd4linux/lcd4linux_0.11.0-SVN.bb
+++ b/meta-openvuplus/recipes-vuplus/lcd4linux/lcd4linux_0.11.0-SVN.bb
@@ -25,7 +25,7 @@ do_setlibtool (){
 }
 
 INITSCRIPT_PARAMS_vuplus = "stop 10 0 6 ."
-inherit autotools update-rc.d
+inherit autotools update-rc.d gettext pkgconfig
 
 INITSCRIPT_NAME = "lcd4linux"
 CONFFILES_${PN} += "${sysconfdir}/lcd4linux.conf"
diff --git a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp.bb b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp.bb
index c84e214..4d9b5ea 100644
--- a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp.bb
+++ b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp.bb
@@ -20,11 +20,12 @@ SRC_URI = "git://code.vuplus.com/git/tuxbox-tuxtxt.git;protocol=git \
 
 S = "${WORKDIR}/git"
 
-inherit autotools
+inherit autotools pkgconfig
 
 do_configure_prepend() {
         touch ${S}/python/__init__.py
         install -m 0644 ${WORKDIR}/plugin.py ${S}/python
+        sed -i 's/AM_INIT_AUTOMAKE.*$/AM_INIT_AUTOMAKE([foreign subdir-objects])/' ${S}/configure.ac
 }
 
 FILES_${PN} += "${datadir}/fonts/tuxtxt.otb ${libdir}/enigma2 /etc/tuxtxt"
diff --git a/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
index 1904bd7..10f4e56 100644
--- a/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
+++ b/meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
@@ -13,6 +13,10 @@ SRC_URI = " \
 	file://${PN}.sh \
 	"
 
+do_configure_prepend() {
+        sed -i 's/AM_INIT_AUTOMAKE.*$/AM_INIT_AUTOMAKE([foreign subdir-objects])/' ${S}/configure.ac
+}
+
 S = "${WORKDIR}/git"
 
 inherit autotools update-rc.d