From: Greg Gilbert <greg@treke.net>
Date: Fri, 20 Aug 2004 05:55:46 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~17586
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fcb936f2f346d6e47bbbb335ad76dd40fbffea3;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into olddog.home.treke.net:/home/ggilbert/oe/packages

2004/08/19 22:55:03-07:00 treke.net!ggilbert
konqueror-embedded_20030705.oe:
  Using the autotools class wipes out the Makefile.in
  code for running MOC. Do things by hand. There are
  still some gcc 3.4 issues that need  working out.

BKrev: 41259262pR-akjTxF-DdOMTNyMOZvw
---

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index a78885149c..ac1ee9e14c 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -9,6 +9,7 @@ gbritton@doomcom.org
 ggilbert@dreamland.(none)
 ggilbert@fastframe.brooks.edu
 ggilbert@olddog.(none)
+ggilbert@olddog.home.treke.net
 ggilbert@olddog.treke.net
 ggilbert@tinman.treke.net
 ggilbert@treke.ath.cx
diff --git a/nonworking/konqueror/konqueror-embedded_20030705.oe b/nonworking/konqueror/konqueror-embedded_20030705.oe
index d675f5f22c..0c2c60aacb 100644
--- a/nonworking/konqueror/konqueror-embedded_20030705.oe
+++ b/nonworking/konqueror/konqueror-embedded_20030705.oe
@@ -8,7 +8,7 @@ SRC_URI = http://devel-home.kde.org/~hausmann/snapshots/konqueror-embedded-snaps
 
 S = "${WORKDIR}/konqueror-embedded-snapshot-${PV}"
 
-inherit autotools libtool
+inherit  libtool
 
 FILES=
 FILES_${PN}=/opt/QtPalmtop
@@ -22,3 +22,37 @@ EXTRA_OECONF = --enable-static --disable-shared --disable-debug --enable-qpe --e
                --with-extra-includes=${STAGING_INCDIR} --with-extra-libs=${STAGING_LIBDIR} --with-ssl-version=0.9.7c \
                --with-ssl-dir=${STAGING_DIR}/target --with-qtopia-dir=${STAGING_DIR}/target --prefix=/opt/QtPalmtop --with-javascript=static
 
+
+do_configure () {
+	./configure \
+	--build=${BUILD_SYS} \
+	--host=${HOST_SYS} \
+	--target=${TARGET_SYS} \
+	--prefix=${prefix} \
+	--exec_prefix=${exec_prefix} \
+	--bindir=${bindir} \
+	--sbindir=${sbindir} \
+	--libexecdir=${libexecdir} \
+	--datadir=${datadir} \
+	--sysconfdir=${sysconfdir} \
+	--sharedstatedir=${sharedstatedir} \
+	--localstatedir=${localstatedir} \
+	--libdir=${libdir} \
+	--includedir=${includedir} \
+	--oldincludedir=${oldincludedir} \
+	--infodir=${infodir} \
+	--mandir=${mandir} \
+	--enable-static  \
+	--disable-shared  \
+	--disable-debug  \
+	--enable-qpe \
+	--enable-embedded     \           
+	--with-extra-includes=${STAGING_INCDIR} \
+	--with-extra-libs=${STAGING_LIBDIR} \
+	--with-ssl-version=0.9.7c \    
+	--with-ssl-dir=${STAGING_DIR}/target \
+	--with-qtopia-dir=${STAGING_DIR}/target \
+	--prefix=/opt/QtPalmtop \
+	--with-javascript=static
+
+}