Merge openembedded@openembedded.bkbits.net:packages-devel

into handhelds.org:/home/kergoth/code/packages

2004/11/16 00:34:37-06:00 handhelds.org!kergoth
Make some packages that were setting --(dis|en)able-nls use the gettext oeclass instead.

BKrev: 41999f95y5kOtyn8kkalbqOVb83Jng

19 files changed, 193 insertions, 39 deletions

diff --git a/binutils/binutils_2.14.90.0.6.oe b/binutils/binutils_2.14.90.0.6.oe
index ac3284e181..e5f7cd02e6 100644
--- a/binutils/binutils_2.14.90.0.6.oe
+++ b/binutils/binutils_2.14.90.0.6.oe
@@ -1,5 +1,5 @@
 SECTION = "devel"
-inherit autotools
+inherit autotools gettext
 
 PR = "r1"
 
@@ -52,7 +52,6 @@ S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
 EXTRA_OECONF = "--with-sysroot=${prefix} \
-		--disable-nls \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-shared"
 
diff --git a/binutils/binutils_2.14.90.0.7.oe b/binutils/binutils_2.14.90.0.7.oe
index a73fee8794..139bc45b6c 100644
--- a/binutils/binutils_2.14.90.0.7.oe
+++ b/binutils/binutils_2.14.90.0.7.oe
@@ -1,5 +1,5 @@
 SECTION = "devel"
-inherit autotools
+inherit autotools gettext
 
 DESCRIPTION = "A GNU collection of binary utilities"
 LICENSE = "GPL"
@@ -52,7 +52,6 @@ S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
 EXTRA_OECONF = "--with-sysroot=${prefix} \
-		--disable-nls \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-shared"
 
diff --git a/binutils/binutils_2.15.90.0.3.oe b/binutils/binutils_2.15.90.0.3.oe
index c7ac536542..466def8c6f 100644
--- a/binutils/binutils_2.15.90.0.3.oe
+++ b/binutils/binutils_2.15.90.0.3.oe
@@ -1,5 +1,5 @@
 SECTION = "devel"
-inherit autotools
+inherit autotools gettext
 
 DESCRIPTION = "A GNU collection of binary utilities"
 LICENSE = "GPL"
@@ -50,7 +50,6 @@ S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
 EXTRA_OECONF = "--with-sysroot=${prefix} \
-		--disable-nls \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-shared"
 
diff --git a/binutils/binutils_2.15.91.0.1.oe b/binutils/binutils_2.15.91.0.1.oe
index e305092fa3..d92cc90312 100644
--- a/binutils/binutils_2.15.91.0.1.oe
+++ b/binutils/binutils_2.15.91.0.1.oe
@@ -1,5 +1,5 @@
 SECTION = "devel"
-inherit autotools
+inherit autotools gettext
 
 DESCRIPTION = "A GNU collection of binary utilities"
 LICENSE = "GPL"
@@ -49,7 +49,6 @@ S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
 EXTRA_OECONF = "--with-sysroot=${prefix} \
-		--disable-nls \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-shared"
 
diff --git a/binutils/binutils_2.15.91.0.2.oe b/binutils/binutils_2.15.91.0.2.oe
index 99db09d988..a2f1addfd5 100644
--- a/binutils/binutils_2.15.91.0.2.oe
+++ b/binutils/binutils_2.15.91.0.2.oe
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 PR = "r4"
 
-inherit autotools
+inherit autotools gettext
 
 PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
 
@@ -50,8 +50,7 @@ SRC_URI = \
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--disable-nls \
-		--program-prefix=${TARGET_PREFIX} \
+EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
 		--enable-shared"
 
 # This is necessary due to a bug in the binutils Makefiles
diff --git a/binutils/binutils_cvs.oe b/binutils/binutils_cvs.oe
index 49cbcf28e3..c20175fdf7 100644
--- a/binutils/binutils_cvs.oe
+++ b/binutils/binutils_cvs.oe
@@ -1,5 +1,5 @@
 SECTION = "devel"
-inherit autotools
+inherit autotools gettext
 
 DESCRIPTION = "A GNU collection of binary utilities"
 LICENSE = "GPL"
@@ -48,7 +48,6 @@ S = "${WORKDIR}/src"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
 EXTRA_OECONF = "--with-sysroot=${prefix} \
-		--disable-nls \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-shared"
 
diff --git a/gcc-csl/gcc-csl_2004-q1a.oe b/gcc-csl/gcc-csl_2004-q1a.oe
index b179975816..b91f1a1dfc 100644
--- a/gcc-csl/gcc-csl_2004-q1a.oe
+++ b/gcc-csl/gcc-csl_2004-q1a.oe
@@ -1,5 +1,5 @@
 SECTION = "devel"
-inherit autotools
+inherit autotools gettext
 
 DESCRIPTION = "The GNU cc and gcc C compilers."
 LICENSE = "GPL"
@@ -138,8 +138,7 @@ python do_patch () {
 S = "${WORKDIR}/gcc-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--disable-nls \
-                --with-gnu-ld \
+EXTRA_OECONF = "--with-gnu-ld \
                 --enable-shared \
                 --enable-multilib \
                 --enable-target-optspace \
diff --git a/gcc-snapshot/gcc-snapshot_cvs.oe b/gcc-snapshot/gcc-snapshot_cvs.oe
index 59a5e32008..dfa9fe5344 100644
--- a/gcc-snapshot/gcc-snapshot_cvs.oe
+++ b/gcc-snapshot/gcc-snapshot_cvs.oe
@@ -1,5 +1,5 @@
 SECTION = "devel"
-inherit autotools
+inherit autotools gettext
 
 PV = "${CVSDATE}"
 DESCRIPTION = "The GNU cc and gcc C compilers."
@@ -119,8 +119,7 @@ python do_patch () {
 S = "${WORKDIR}/gcc"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--disable-nls \
-                --with-gnu-ld \
+EXTRA_OECONF = "--with-gnu-ld \
                 --enable-shared \
                 --enable-multilib \
                 --enable-target-optspace \
diff --git a/gdb/gdb_6.1.oe b/gdb/gdb_6.1.oe
index f187f5bc8e..081eb6040f 100644
--- a/gdb/gdb_6.1.oe
+++ b/gdb/gdb_6.1.oe
@@ -7,7 +7,7 @@ DEPENDS = "ncurses readline"
 PACKAGES =+ 'gdbserver '
 FILES_gdbserver = '${bindir}/gdbserver'
 
-inherit autotools
+inherit autotools gettext
 
 SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
 	   file://uclibc.patch;patch=1"
@@ -22,7 +22,7 @@ export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
 export CFLAGS_append=" -L${STAGING_LIBDIR}"
 EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
 
-EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x --disable-nls \
+EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
                 --with-curses --with-readline --disable-sim \
                 --program-prefix=''"
 
diff --git a/gdb/gdb_6.2.1.oe b/gdb/gdb_6.2.1.oe
index 46ff8d4006..5bd3b2b51c 100644
--- a/gdb/gdb_6.2.1.oe
+++ b/gdb/gdb_6.2.1.oe
@@ -9,7 +9,7 @@ DEPENDS = "ncurses readline"
 PACKAGES =+ 'gdbserver '
 FILES_gdbserver = '${bindir}/gdbserver'
 
-inherit autotools
+inherit autotools gettext
 
 SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
 	   file://uclibc.patch;patch=1 \
@@ -25,7 +25,7 @@ export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
 export CFLAGS_append=" -L${STAGING_LIBDIR}"
 EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
 
-EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x --disable-nls \
+EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
                 --with-curses --disable-multilib --with-readline --disable-sim \
                 --program-prefix=''"
 
diff --git a/gdb/gdb_6.2.oe b/gdb/gdb_6.2.oe
index dc1e2106d1..b8d0ec606e 100644
--- a/gdb/gdb_6.2.oe
+++ b/gdb/gdb_6.2.oe
@@ -8,7 +8,7 @@ DEPENDS = "ncurses readline"
 PACKAGES =+ 'gdbserver '
 FILES_gdbserver = '${bindir}/gdbserver'
 
-inherit autotools
+inherit autotools gettext
 
 SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
 	   file://uclibc.patch;patch=1"
@@ -23,7 +23,7 @@ export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
 export CFLAGS_append=" -L${STAGING_LIBDIR}"
 EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
 
-EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x --disable-nls \
+EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
                 --with-curses --disable-multilib --with-readline --disable-sim \
                 --program-prefix=''"
 
diff --git a/lftp/lftp_3.0.1.oe b/lftp/lftp_3.0.1.oe
index a054bbdedb..d1445b2c92 100644
--- a/lftp/lftp_3.0.1.oe
+++ b/lftp/lftp_3.0.1.oe
@@ -9,7 +9,6 @@ PR = "r1"
 SRC_URI = "http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-${PV}.tar.bz2 \
 	   file://pty.patch;patch=1"
 
-EXTRA_OECONF = "--disable-largefile --disable-rpath --disable-nls --with-included-readline=no"
+EXTRA_OECONF = "--disable-largefile --disable-rpath --with-included-readline=no"
 
-
-inherit autotools
+inherit autotools gettext
diff --git a/libffi/libffi_2.0+gcc3.4.1.oe b/libffi/libffi_2.0+gcc3.4.1.oe
index a2204a6a0f..2708d0f31d 100644
--- a/libffi/libffi_2.0+gcc3.4.1.oe
+++ b/libffi/libffi_2.0+gcc3.4.1.oe
@@ -4,7 +4,7 @@ LICENSE = "libffi"
 PRIORITY = "optional"
 MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
 
-inherit autotools
+inherit autotools gettext
 
 PACKAGES = "${PN} ${PN}-dev"
 
@@ -28,8 +28,7 @@ ${GNU_MIRROR}/gcc/	http://mirrors.rcn.net/pub/sourceware/gcc/releases/
 S = "${WORKDIR}/gcc-${GCC_VER}/libffi"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--disable-nls \
-                --with-gnu-ld \
+EXTRA_OECONF = "--with-gnu-ld \
                 --enable-shared \
                 --enable-target-optspace \
                 --enable-languages=c,c++,f77 \
diff --git a/libxine/libxine-opie_1.0.0-rc7.oe b/libxine/libxine-opie_1.0.0-rc7.oe
index e69de29bb2..b0d5db2ba6 100644
--- a/libxine/libxine-opie_1.0.0-rc7.oe
+++ b/libxine/libxine-opie_1.0.0-rc7.oe
@@ -0,0 +1,96 @@
+# libxine OE build file
+# Modified by Advanced Micro Devices, Inc.
+
+DESCRIPTION = "libxine compiled for Opie"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = "zlib libogg tremor libmad"
+PROVIDES = "virtual/libxine"
+
+inherit autotools pkgconfig gettext
+
+S = "${WORKDIR}/xine-lib-1-rc7"
+
+SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1-rc7.tar.gz \
+	file://cpu-${PV}.patch;patch=1 \
+	file://configure-${PV}.patch;patch=1 \
+	file://demuxogg.patch;patch=1 \
+	file://fix-syntax.patch;patch=1 \
+	file://libxine-cut-memusage.patch;patch=1 \
+	file://libxine-ffmpeg-enable-arm.patch;patch=1 \
+	file://libxine-libvorbis.patch;patch=1 \
+	file://libxine-tremor-autoconf.patch;patch=1 \
+	file://mpegvideo-static-inlinine.patch;patch=1 \
+	file://libxine-arm-configure.patch;patch=1 "
+
+
+
+SOV = "1.0.7"
+
+# Omit the annoying xine-config in /usr/bin
+FILES_${PN}="/usr/lib/*.so*"
+
+# And include it in the dev package
+FILES_${PN}-dev += " /usr/bin"
+
+EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
+	--with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+	--disable-oggtest \
+	--with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+	--disable-altivec --disable-vis --disable-mlib \
+	--enable-shared --disable-static \ 
+	--disable-fb --disable-alsa --disable-vcd \
+	--disable-asf --disable-faad --disable-iconv \
+	--disable-aalib --with-xv-path=${STAGING_LIBDIR} \
+	--without-v4l --without-arts --without-sdl \
+	--disable-dxr3 --without-xv --without-xvmc \
+	--without-xxmc --without-Xshm "
+			      
+do_compile() {
+	oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool
+}
+
+do_install() {
+	oe_runmake DESTDIR=${D} LIBTOOL=${S}/${TARGET_SYS}-libtool install
+}
+
+HEADERS="src/xine-engine/xineintl.h src/xine-utils/xineutils.h            \
+	src/xine-engine/xine_internal.h  src/xine-engine/xine_plugin.h    \
+	src/xine-utils/xine_buffer.h     src/xine-engine/video_out.h      \
+	src/xine-engine/buffer.h         src/xine-engine/vo_scale.h       \
+	src/xine-engine/configfile.h     src/xine-utils/attributes.h      \
+	src/xine-engine/info_helper.h    src/xine-engine/scratch.h        \
+	src/xine-engine/audio_decoder.h  src/input/input_plugin.h         \
+	src/xine-engine/spu_decoder.h    src/xine-engine/audio_out.h      \
+	src/xine-engine/io_helper.h      src/xine-engine/video_decoder.h  \
+	src/xine-engine/broadcaster.h    src/xine-engine/metronom.h       \
+	src/xine-utils/xmllexer.h        src/xine-engine/osd.h            \
+	src/xine-engine/video_overlay.h  src/xine-utils/xmlparser.h       \
+	src/xine-utils/compat.h          src/xine-engine/plugin_catalog.h \
+	src/xine-engine/post.h           src/demuxers/demux.h             \
+	src/xine-engine/resample.h	 lib/os_types.h                   \
+	src/xine-engine/refcounter.h"
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/xine
+
+	install -m 0644 ${S}/include/xine.h ${STAGING_INCDIR}
+
+	for file in ${HEADERS}; do
+		cp ${S}/$file ${STAGING_INCDIR}/xine/`basename $file`
+	done
+
+	oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR}
+}
+
+python populate_packages_prepend () {
+	plugindir = oe.data.expand('${libdir}/xine/plugins/1.0.0', d)
+	do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
+
+	postdir = oe.data.expand('${libdir}/xine/plugins/1.0.0/post', d)
+	do_split_packages(d, postdir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
+
+	fontdir = oe.data.expand('${datadir}/xine/libxine1/fonts', d)
+	do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s', extra_depends='' )
+}
diff --git a/libxine/libxine_1.0.0-rc5.oe b/libxine/libxine_1.0.0-rc5.oe
index e69de29bb2..90f57f2be3 100644
--- a/libxine/libxine_1.0.0-rc5.oe
+++ b/libxine/libxine_1.0.0-rc5.oe
@@ -0,0 +1,69 @@
+# libxine OE build file
+# Modified by Advanced Micro Devices, Inc.
+
+DESCRIPTION = "libxine"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = "zlib libogg libvorbis libmad"
+
+inherit autotools pkgconfig gettext
+
+S = "${WORKDIR}/xine-lib-1-rc5"
+
+SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1-rc5.tar.gz \
+	file://cpu.patch;patch=1 \
+	file://configure.patch;patch=1"
+
+SOV = "1.0.6"
+
+# Omit the annoying xine-config in /usr/bin
+FILES_${PN}="/usr/lib/*.so*"
+
+# And include it in the dev package
+FILES_${PN}-dev += " /usr/bin"
+
+EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
+	--with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+	--disable-oggtest \
+	--with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+	--disable-altivec --disable-vis --disable-mlib \
+	--disable-fb --disable-alsa --disable-vcd \
+	--disable-asf --disable-faad --disable-iconv \
+	--disable-aalib \
+	--without-v4l --without-arts --without-sdl"
+			      
+do_compile() {
+	oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool
+}
+
+do_install() {
+	oe_runmake DESTDIR=${D} LIBTOOL=${S}/${TARGET_SYS}-libtool install
+}
+
+HEADERS="src/xine-engine/xineintl.h src/xine-utils/xineutils.h \
+	src/xine-engine/xine_internal.h src/xine-engine/xine_plugin.h \
+	src/xine-utils/xine_buffer.h"
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/xine
+
+	install -m 0644 ${S}/include/xine.h ${STAGING_INCDIR}
+
+	for file in ${HEADERS}; do
+		cp ${S}/$file ${STAGING_INCDIR}/xine/`basename $file`
+	done
+
+	oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR}
+}
+
+python populate_packages_prepend () {
+	plugindir = oe.data.expand('${libdir}/xine/plugins/1.0.0', d)
+	do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s')
+
+	postdir = oe.data.expand('${libdir}/xine/plugins/1.0.0/post', d)
+	do_split_packages(d, postdir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s')
+
+	fontdir = oe.data.expand('${datadir}/xine/libxine1/fonts', d)
+	do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s')
+}
diff --git a/libxine/libxine_1.0.0-rc7.oe b/libxine/libxine_1.0.0-rc7.oe
index 15c8184470..ae8ae987c0 100644
--- a/libxine/libxine_1.0.0-rc7.oe
+++ b/libxine/libxine_1.0.0-rc7.oe
@@ -31,7 +31,7 @@ MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
 DEPENDS = "zlib libogg libvorbis libmad"
 PROVIDES = "virtual/libxine"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
 S = "${WORKDIR}/xine-lib-1-rc7"
 
@@ -55,7 +55,7 @@ EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
 	--enable-shared --disable-static \ 
 	--disable-fb --disable-alsa --disable-vcd \
 	--disable-asf --disable-faad --disable-iconv \
-	--disable-nls --disable-aalib --with-xv-path=${STAGING_LIBDIR} \
+	--disable-aalib --with-xv-path=${STAGING_LIBDIR} \
 	--without-v4l --without-arts --without-sdl"
 			      
 do_compile() {
diff --git a/matchbox-panel/matchbox-panel_0.8.1.oe b/matchbox-panel/matchbox-panel_0.8.1.oe
index 077e19a24c..5844cad1f1 100644
--- a/matchbox-panel/matchbox-panel_0.8.1.oe
+++ b/matchbox-panel/matchbox-panel_0.8.1.oe
@@ -10,9 +10,9 @@ SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-
 	file://make-batteryapp-less-strict.patch;patch=1"
 S = "${WORKDIR}/matchbox-panel-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
-EXTRA_OECONF = "--enable-startup-notification --enable-dnotify --enable-nls --enable-small-icons"
+EXTRA_OECONF = "--enable-startup-notification --enable-dnotify --enable-small-icons"
 
 FILES_${PN} = "${bindir} \
 	       ${datadir}/applications \
diff --git a/matchbox-panel/matchbox-panel_0.8.3.oe b/matchbox-panel/matchbox-panel_0.8.3.oe
index a8e3a964f8..445b8d38de 100644
--- a/matchbox-panel/matchbox-panel_0.8.3.oe
+++ b/matchbox-panel/matchbox-panel_0.8.3.oe
@@ -7,9 +7,9 @@ SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-
 	file://make-batteryapp-less-strict.patch;patch=1"
 S = "${WORKDIR}/matchbox-panel-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
-EXTRA_OECONF = "--enable-startup-notification --enable-dnotify --enable-nls --enable-small-icons"
+EXTRA_OECONF = "--enable-startup-notification --enable-dnotify --enable-small-icons"
 
 FILES_${PN} = "${bindir} \
 	       ${datadir}/applications \
diff --git a/matchbox-panel/matchbox-panel_0.8.oe b/matchbox-panel/matchbox-panel_0.8.oe
index ae265a3160..fd31832b39 100644
--- a/matchbox-panel/matchbox-panel_0.8.oe
+++ b/matchbox-panel/matchbox-panel_0.8.oe
@@ -7,9 +7,8 @@ RDEPENDS = "libmatchbox matchbox-common"
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/${PV}/matchbox-panel-${PV}.tar.bz2"
 S = "${WORKDIR}/matchbox-panel-${PV}"
 
-inherit autotools  pkgconfig
+inherit autotools pkgconfig gettext
 
 EXTRA_OECONF = "--enable-small-icons"
 #		--enable-dnotify
 #		--enable-startup-notification
-#		--enable-nls