From 57e0965d94297295a4d9a55530d34b2ccf7f2b99 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 26 Jan 2010 21:37:13 +0000
Subject: glibmm_2.22.1.bb : fix/bandaid autoconf

I noticed when I changed libtool this package didnt pass configure as
it had disabled OEs autoconf handling. This is because the examples/
directory has bad autoconf for it. So bandaided this to allow
autoreconf to run correctly.
---
 recipes/glibmm/files/remove-examples.patch | 30 ++++++++++++++++++++++++++++++
 recipes/glibmm/glibmm_2.22.1.bb            |  9 ++++-----
 2 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 recipes/glibmm/files/remove-examples.patch

(limited to 'recipes/glibmm')

diff --git a/recipes/glibmm/files/remove-examples.patch b/recipes/glibmm/files/remove-examples.patch
new file mode 100644
index 0000000000..a5944c2889
--- /dev/null
+++ b/recipes/glibmm/files/remove-examples.patch
@@ -0,0 +1,30 @@
+Index: glibmm-2.22.1/Makefile.am
+===================================================================
+--- glibmm-2.22.1.orig/Makefile.am
++++ glibmm-2.22.1/Makefile.am
+@@ -23,12 +23,7 @@ src_subdirs = glib/src gio/src
+ else
+ src_subdirs =
+ endif
+-if ENABLE_DOCUMENTATION
+-doc_subdirs = docs
+-else
+-doc_subdirs =
+-endif
+-SUBDIRS = tools $(src_subdirs) glib/glibmm gio/giomm tests examples $(doc_subdirs)
++SUBDIRS = tools $(src_subdirs) glib/glibmm gio/giomm tests
+ 
+ glibmm_includedir = $(includedir)/$(GLIBMM_MODULE_NAME)
+ glibmm_include_HEADERS = glib/glibmm.h
+Index: glibmm-2.22.1/configure.ac
+===================================================================
+--- glibmm-2.22.1.orig/configure.ac
++++ glibmm-2.22.1/configure.ac
+@@ -136,7 +136,6 @@ AC_CONFIG_FILES([Makefile
+                  gio/src/Makefile
+                  gio/giomm/Makefile
+                  tests/Makefile
+-                 examples/Makefile
+                  docs/Makefile
+                  docs/reference/Doxyfile
+                  MSVC_Net2005/glibmm/glibmm.rc
diff --git a/recipes/glibmm/glibmm_2.22.1.bb b/recipes/glibmm/glibmm_2.22.1.bb
index d96a372d26..737e140657 100644
--- a/recipes/glibmm/glibmm_2.22.1.bb
+++ b/recipes/glibmm/glibmm_2.22.1.bb
@@ -1,9 +1,8 @@
 require glibmm.inc
 
-do_configure() {
-	libtoolize --force
-	gnu-configize
-	oe_runconf
-}
+DEPENDS += "mm-common"
 
+SRC_URI += " file://remove-examples.patch;patch=1"
+
+PR = "r1"
 
-- 
cgit 1.2.3-korg