Merge bk://openembedded@openembedded.bkbits.net/packages

into gandalf.tm.informatik.uni-frankfurt.de:/home/pb_/packages

2004/06/04 09:59:32+02:00 uni-frankfurt.de!pb_
override ORBIT_IDL during build

BKrev: 40c02be9-sRPmpV5W2cPkGOuikyoZA

diff --git a/gnome/gconf_2.6.1.oe b/gnome/gconf_2.6.1.oe
index a326e3f..910d7a9 100644 (file)
--- a/gnome/gconf_2.6.1.oe
+++ b/gnome/gconf_2.6.1.oe
@@ -2,7 +2,7 @@ SECTION = "gnome/base"
 DESCRIPTION = "GNOME configuration database system"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \
           file://backends.patch;patch=1"
-DEPENDS = "orbit2 glib-2.0 gettext-native"
+DEPENDS = "orbit2 glib-2.0 gettext-native libxml2"
 
 FILES_${PN} += " ${libdir}/GConf/*"
 
@@ -14,6 +14,10 @@ inherit autotools pkgconfig
 
 HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
 
+do_compile() {
+       oe_runmake ORBIT_IDL="`which orbit-idl2`"
+}
+
 do_stage() {
        oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
        install -d ${STAGING_INCDIR}/gconf/2/gconf/