gconf-osso: Unb0rk configure on systems w/o PKG_CONFIG set

diff --git a/packages/maemo/gconf-osso/configure-dbus.patch b/packages/maemo/gconf-osso/configure-dbus.patch
new file mode 100644 (file)
index 0000000..dfba076
--- /dev/null
+++ b/packages/maemo/gconf-osso/configure-dbus.patch
@@ -0,0 +1,11 @@
+--- GConf-2.6.4/configure.in.orig      2007-03-03 18:30:35.000000000 +0000
++++ GConf-2.6.4/configure.in   2007-03-03 18:30:50.000000000 +0000
+@@ -186,7 +186,7 @@
+ 
+ AC_ARG_WITH(ipc, [  --with-ipc=[orbit/dbus/both]   choose ipc mechanism to use in the daemon, [default=dbus]], with_ipc="$withval", with_ipc=dbus)
+ 
+-if test x$with_ipc = xorbit -o x$with_ipc = xboth; then
++if test x$with_ipc = xorbit -o x$with_ipc = xboth -o x$with_ipc = xdbus; then
+   PKG_CHECK_MODULES(GCONF_ORBIT, ORBit-2.0 >= 2.4.0 linc >= 0.5.0, have_orbit=yes, have_orbit=no)
+   if test x$have_orbit = xno ; then
+     AC_MSG_WARN([ORBit development libraries not found])

diff --git a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
index 72ddfb5..6c3902f 100644 (file)
--- a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
+++ b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 PROVIDES = "gconf"
 RPROVIDES = "gconf"
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -14,6 +14,7 @@ SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/g/gconf2/gconf2_${
            file://free-entry-fix.diff;patch=1 \
            file://no-po-no-examples.diff;patch=1 \
            file://service-file.diff;patch=1 \
+          file://configure-dbus.patch;patch=1 \
            file://gconf-daemon-dbus-oe.sh \
            file://gconf-daemon-oe.sh"