[oe-commits] org.oe.dev merge of '744cf977fa353b9dedb30f35cd9ba988ade94e8d'
pfalcon commit
openembedded-commits at lists.openembedded.org
Tue Jan 1 09:07:39 UTC 2008
merge of '744cf977fa353b9dedb30f35cd9ba988ade94e8d'
and 'cbd73e4685a6b456be3670606d5020189741092e'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: ec1e9cbba63f78bf244d72fe4907dab991a4b812
ViewMTN: http://monotone.openembedded.org/revision/info/ec1e9cbba63f78bf244d72fe4907dab991a4b812
Files:
1
packages/gnome-mplayer
packages/gnome-mplayer/files
packages/gnome-mplayer/files/1.patch
packages/gnome-mplayer/files/ac-gthread.patch
packages/gnome-mplayer/gnome-mplayer_0.5.3.bb
packages/gnome-mplayer/gnome-mplayer_cvs.bb
packages/vala/vala-native_0.1.4.bb
packages/vala/vala-native_0.1.5.bb
packages/vala/vala_0.1.4.bb
packages/vala/vala_0.1.5.bb
packages/docbook-dsssl-stylesheets
packages/docbook-sgml-dtd
packages/ixp4xx/ixp4xx-npe-2.4
packages/bluez/bluez-cups-backend_3.24.bb
packages/bluez/bluez-gnome_0.15.bb
packages/bluez/bluez-gstreamer-plugin_3.24.bb
packages/bluez/bluez-libs_3.24.bb
packages/bluez/bluez-utils-alsa_3.24.bb
packages/bluez/bluez-utils_3.24.bb
packages/distcc/files/distcc-avahi.patch
packages/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb
packages/docbook-utils/docbook-utils-native_0.6.14.bb
packages/docbook-utils/docbook-utils_0.6.14.bb
packages/gcc/gcc-native.inc
packages/gcc/gcc-native_3.4.4.bb
packages/ixp4xx/ixp4xx-npe-2.4/Intel
packages/linux/linux-rp-2.6.23/hrw-add-wcf11-to-hostap.patch
packages/openjade/openjade-1.3.2/oj-native-libosp-fix.patch
packages/vte/vte.inc
packages/vte/vte_0.16.9.bb
packages/webkit/files/GNUmakefile.am
packages/webkit/files/autogen.sh
packages/webkit/files/configure.ac
classes/angstrom-mirrors.bbclass
conf/distro/include/slugos.inc
conf/distro/unslung.conf
packages/distcc/distcc_2.18.3.bb
packages/distcc/files/distcc
packages/docbook-utils/docbook-utils-native_0.6.13.bb
packages/docbook-utils/docbook-utils_0.6.13.bb
packages/gcc/gcc-package.inc
packages/hwdata/hwdata_0.191.bb
packages/ixp4xx/ixp4xx-npe_2.4.bb
packages/linux/linux-rp-2.6.23/defconfig-poodle
packages/linux/linux-rp_2.6.23.bb
packages/nslu2-binary-only/unslung-rootfs/NOTES
packages/nslu2-binary-only/unslung-rootfs/README
packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
packages/openjade/openjade-native_1.3.2.bb
packages/openmoko2/openmoko-terminal2_svn.bb
packages/opensp/opensp-native_1.5.bb
packages/qemu/qemu-gcc3-check.inc
packages/sgml-common/sgml-common-native_0.6.3.bb
packages/sgml-common/sgml-common_0.6.3.bb
packages/vte/vte_0.16.8.bb
packages/webkit/webkit-gtk_svn.bb
Diffs:
#
# mt diff -r744cf977fa353b9dedb30f35cd9ba988ade94e8d -rec1e9cbba63f78bf244d72fe4907dab991a4b812
#
#
#
# add_dir "packages/gnome-mplayer"
#
# add_dir "packages/gnome-mplayer/files"
#
# add_file "packages/gnome-mplayer/files/1.patch"
# content [c9e6dc9f616e19c1538a4e6f44cf425f906db5c5]
#
# add_file "packages/gnome-mplayer/files/ac-gthread.patch"
# content [c93920accaf7ee84b2102eed7a2e3f18a2e3d687]
#
# add_file "packages/gnome-mplayer/gnome-mplayer_0.5.3.bb"
# content [dc61dd1c6a05ba82814135c247fd7e63ab1211fa]
#
# add_file "packages/gnome-mplayer/gnome-mplayer_cvs.bb"
# content [ed0554f6c2a18456399fd04659d92057d216eda9]
#
============================================================
--- packages/gnome-mplayer/files/1.patch c9e6dc9f616e19c1538a4e6f44cf425f906db5c5
+++ packages/gnome-mplayer/files/1.patch c9e6dc9f616e19c1538a4e6f44cf425f906db5c5
@@ -0,0 +1,37 @@
+# HG changeset patch
+# User "Paul Sokolovsky <pfalcon at users.sourceforge.net>"
+# Date 1199174323 -7200
+# Node ID d630a2e72d3fa094a330f5bd6351b0cf7c9690a6
+# Parent 4b4820fa6fff9dbb8c6c8e1bd23eed54faf10982
+gui.c: Add vertical pane layout for main i/f vs playlist.
+Decision which layout to use is based on screen aspect.
+This change will allow sane layout on PDA devices, many
+of which have vertical layout by default. Possible
+improvements:
+1. Add menu check item for users to be able to select layout
+as they see fit.
+
+diff -r 4b4820fa6fff -r d630a2e72d3f src/gui.c
+--- a/src/gui.c Tue Jan 01 09:29:28 2008 +0200
++++ b/src/gui.c Tue Jan 01 09:58:43 2008 +0200
+@@ -3071,8 +3071,20 @@ GtkWidget *create_window(gint windowid)
+
+ gtk_widget_show(menubar);
+ gtk_widget_show(drawing_area);
++ if (gdk_screen_width() > gdk_screen_height()) {
+ pane = gtk_hpaned_new();
+ gtk_paned_pack1(GTK_PANED(pane),vbox,TRUE,TRUE);
++ } else {
++ GtkRequisition menu_size;
++ GtkRequisition vbox_size;
++ pane = gtk_vpaned_new();
++ gtk_paned_pack1(GTK_PANED(pane),vbox,TRUE,FALSE); /* No shrink beyond size request*/
++
++ gtk_widget_size_request(menubar, &menu_size);
++ gtk_widget_size_request(vbox, &vbox_size);
++ /* 5 is adhox compensation for layout issues ;-( */
++ gtk_widget_set_size_request(vbox, -1, menu_size.height + vbox_size.height - 5);
++ }
+
+ gtk_container_add(GTK_CONTAINER(window), pane);
+
============================================================
--- packages/gnome-mplayer/files/ac-gthread.patch c93920accaf7ee84b2102eed7a2e3f18a2e3d687
+++ packages/gnome-mplayer/files/ac-gthread.patch c93920accaf7ee84b2102eed7a2e3f18a2e3d687
@@ -0,0 +1,12 @@
+diff -r d630a2e72d3f configure.in
+--- a/configure.in Tue Jan 01 09:58:43 2008 +0200
++++ b/configure.in Tue Jan 01 10:16:44 2008 +0200
+@@ -32,7 +32,7 @@ AM_PROG_LIBTOOL
+ #AC_SUBST(GNOME_CFLAGS)
+ #AC_SUBST(GNOME_LIBS)
+
+-PKG_CHECK_MODULES(GTK, [gtk+-2.0 glib-2.0])
++PKG_CHECK_MODULES(GTK, [gtk+-2.0 glib-2.0 gthread-2.0])
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+
============================================================
--- packages/gnome-mplayer/gnome-mplayer_0.5.3.bb dc61dd1c6a05ba82814135c247fd7e63ab1211fa
+++ packages/gnome-mplayer/gnome-mplayer_0.5.3.bb dc61dd1c6a05ba82814135c247fd7e63ab1211fa
@@ -0,0 +1,11 @@
+DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration"
+HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/"
+LICENSE = "GPL"
+DEPENDS = "gtk+ gconf dbus-glib"
+PR = "r1"
+
+inherit autotools pkgconfig gconf
+
+SRC_URI = "http://dekorte.homeip.net/download/${PN}/${P}.tar.gz \
+ file://ac-gthread.patch;patch=1 \
+ file://1.patch;patch=1"
============================================================
--- packages/gnome-mplayer/gnome-mplayer_cvs.bb ed0554f6c2a18456399fd04659d92057d216eda9
+++ packages/gnome-mplayer/gnome-mplayer_cvs.bb ed0554f6c2a18456399fd04659d92057d216eda9
@@ -0,0 +1,15 @@
+DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration"
+HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/"
+LICENSE = "GPL"
+DEPENDS = "gtk+ gconf dbus-glib"
+SRCDATE = "20080101"
+PV = "0.5.3+cvs${SRCDATE}"
+PR = "r1"
+
+inherit autotools pkgconfig gconf
+
+S = "${WORKDIR}/${PN}"
+
+SRC_URI = "cvs://anonymous@dekorte.homeip.net/data/cvs;module=${PN} \
+ file://ac-gthread.patch;patch=1 \
+ file://1.patch;patch=1"
#
# mt diff -rcbd73e4685a6b456be3670606d5020189741092e -rec1e9cbba63f78bf244d72fe4907dab991a4b812
#
#
#
# rename "packages/vala/vala-native_0.1.4.bb"
# to "packages/vala/vala-native_0.1.5.bb"
#
# rename "packages/vala/vala_0.1.4.bb"
# to "packages/vala/vala_0.1.5.bb"
#
# add_dir "packages/docbook-dsssl-stylesheets"
#
# add_dir "packages/docbook-sgml-dtd"
#
# add_dir "packages/ixp4xx/ixp4xx-npe-2.4"
#
# add_file "packages/bluez/bluez-cups-backend_3.24.bb"
# content [6d3dd18f0576378f8bae0c3e251bce0ca132176e]
#
# add_file "packages/bluez/bluez-gnome_0.15.bb"
# content [b4b42d7a72595784b9e4a5628c4211153814d05b]
#
# add_file "packages/bluez/bluez-gstreamer-plugin_3.24.bb"
# content [f67c210c4018f045ec0a87f2baff07aefd2c19ae]
#
# add_file "packages/bluez/bluez-libs_3.24.bb"
# content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
#
# add_file "packages/bluez/bluez-utils-alsa_3.24.bb"
# content [b7eb82c734b71cf61ac35a052d87da836df665d4]
#
# add_file "packages/bluez/bluez-utils_3.24.bb"
# content [e19b966dd298ba92c4980f3df32211c2eeffc8f1]
#
# add_file "packages/distcc/files/distcc-avahi.patch"
# content [df8cdab0a7e2910982955936c26053276101bc21]
#
# add_file "packages/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb"
# content [aa75988e092a906a1a120c664ba50174075aee9f]
#
# add_file "packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb"
# content [dc639dcc8d259f0b47f5c3350b926cc213ffe48f]
#
# add_file "packages/docbook-utils/docbook-utils-native_0.6.14.bb"
# content [1a0a22dd392f60cedcc86e8ef30f293786d3ebc9]
#
# add_file "packages/docbook-utils/docbook-utils_0.6.14.bb"
# content [0649f3df0e00e7584283a5a7a634d4270ded6b8a]
#
# add_file "packages/gcc/gcc-native.inc"
# content [cc4d24806d661d7f81f992f3374fa964057f6b83]
#
# add_file "packages/gcc/gcc-native_3.4.4.bb"
# content [19c28b5b7930d8add4e173e6acb5e5d88687fba8]
#
# add_file "packages/ixp4xx/ixp4xx-npe-2.4/Intel"
# content [d7972e8b3ee1055b25a24c37c281268309bfa0e9]
#
# add_file "packages/linux/linux-rp-2.6.23/hrw-add-wcf11-to-hostap.patch"
# content [1efe4a4eb08036c0edbd2f569a061877139f11df]
#
# add_file "packages/openjade/openjade-1.3.2/oj-native-libosp-fix.patch"
# content [d5b2748d24c206d6767fcb4acc4b8eff1f176418]
#
# add_file "packages/vte/vte.inc"
# content [695b3ba40c29481f179d025379ad74da6577664b]
#
# add_file "packages/vte/vte_0.16.9.bb"
# content [c930d8d34a3c5132f815de63792d7e7cea7195ee]
#
# add_file "packages/webkit/files/GNUmakefile.am"
# content [1405c30a670778ad477a10c30a1b572b4b4b248c]
#
# add_file "packages/webkit/files/autogen.sh"
# content [4c1b8c78cb4a028f0b02454d4d31826719d46e70]
#
# add_file "packages/webkit/files/configure.ac"
# content [70fcd958d25c14bab5be08366359f409c77d0b14]
#
# patch "classes/angstrom-mirrors.bbclass"
# from [5cb52a71d99b0e1e741b10beef5daa2a8a206bd0]
# to [a4bf6a870337718fc8cb7f8d3d3aa8624be9d053]
#
# patch "conf/distro/include/slugos.inc"
# from [33a45c83269ec4af99a3349a9aa818e1e1afba35]
# to [f4c056445c0ee404edee2128fd79fe59c7a2507d]
#
# patch "conf/distro/unslung.conf"
# from [194f4051df47699a85e78044f9dadbe076483907]
# to [7b0e0bc438c5fcb96fd9209b237a79bf3b86554a]
#
# patch "packages/distcc/distcc_2.18.3.bb"
# from [0f31a836477297ae3e9cfc2cf2c9ceabe38d85d3]
# to [980168c7626a06af4ee3c091da786c662f16fad8]
#
# patch "packages/distcc/files/distcc"
# from [d9b7e67dcbc6dc515b349c006234d703497781ae]
# to [3c9d22e56660bcb0b9475bd4374467577d19deee]
#
# patch "packages/docbook-utils/docbook-utils-native_0.6.13.bb"
# from [3d93093bc2b1ef880017f0bf3e754a28c7b0a836]
# to [a7ee2c212558f566489c117e06527d0e0f46fc6c]
#
# patch "packages/docbook-utils/docbook-utils_0.6.13.bb"
# from [0649f3df0e00e7584283a5a7a634d4270ded6b8a]
# to [971d7eb961bc824431f089f908bd85f2bec36e6b]
#
# patch "packages/gcc/gcc-package.inc"
# from [1cc2816065e59a4b33fa88fb69ad95372838e537]
# to [760299e5f8168507c53a5d73b89438f7a75d5c7c]
#
# patch "packages/hwdata/hwdata_0.191.bb"
# from [a4e6f065bfb933c005991e7b3698b9b17758f174]
# to [75972da3f9c8058b901b63c5530afa723f824921]
#
# patch "packages/ixp4xx/ixp4xx-npe_2.4.bb"
# from [96a7443ad2d24af9c5148c5c0108ab76d9ef1cdc]
# to [6b2f094d5f9c1beaef5b08d10275a3e1608b209e]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-poodle"
# from [9089b908d87d4678ba180892f1b7031db32f17f1]
# to [09d7ed3a857d79fd98b743e6eb0e827e353a6ada]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [df3efc4bdc8fdbcaa19a0e0aeeb4dff97c353477]
# to [5d7d03fa911c5c9239bbe6af4d43a4bdbdfea39e]
#
# patch "packages/nslu2-binary-only/unslung-rootfs/NOTES"
# from [1018d616738e4db8f4052776eefe6e68335785d1]
# to [1175fa063822e35cb7d37f1902fc899b93d427b0]
#
# patch "packages/nslu2-binary-only/unslung-rootfs/README"
# from [7317daabbdc813eacd82e1fed65976d665bbeb95]
# to [9333318f5c1cdd9d9bf5875ae94c1d975edfc071]
#
# patch "packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb"
# from [0645c1c97b8a92be945e7b8f0378c21a210c9f69]
# to [2a4b9747404f4ddaab6c5c9ed40dbcc4e0caa0b6]
#
# patch "packages/openjade/openjade-native_1.3.2.bb"
# from [f35386e84bbea055b9cfad89402410611d8f6355]
# to [a52f31c28f7c08278c660f313341d184d1b82c61]
#
# patch "packages/openmoko2/openmoko-terminal2_svn.bb"
# from [b2c47944ba3c9a3b6d9e1869372029f3314a0a23]
# to [c92f27f4866500c78b42fc39276964920d6967bc]
#
# patch "packages/opensp/opensp-native_1.5.bb"
# from [16ea438e58f71aa62ee2cec6c2ca21048e966ee9]
# to [923a1b753e959729f039730944162711ce307a03]
#
# patch "packages/qemu/qemu-gcc3-check.inc"
# from [2e11e76ecd0c388cdcfd1319c8601c429ba5888e]
# to [ab9405e1e7f0697d39ad932818e4d113c0fbd3ea]
#
# patch "packages/sgml-common/sgml-common-native_0.6.3.bb"
# from [175628c2b23297df21561c87e6bfa0ca2fc4fba4]
# to [c520b9fd45bd6e29de28aabfdb62552ba1be396d]
#
# patch "packages/sgml-common/sgml-common_0.6.3.bb"
# from [5eb62eab9bfa3d76f9327fffeaba7fe9e3734375]
# to [7275ba0e5676e47fd988309b86550924fe1f1165]
#
# patch "packages/vala/vala-native_0.1.5.bb"
# from [4debe02a0d283ef995a164e0a0c0f85ecb7d9f95]
# to [a2025c0a2c1789ecae501ca7934e5dfa164ef7b6]
#
# patch "packages/vte/vte_0.16.8.bb"
# from [1b97608593a056a762e15abfbe4eed0386f61689]
# to [c930d8d34a3c5132f815de63792d7e7cea7195ee]
#
# patch "packages/webkit/webkit-gtk_svn.bb"
# from [2b24d6f59232655003cc23519603a66cec5aca93]
# to [875d1bd8f5838488ad5849454b60b0ed23e6e68e]
#
============================================================
--- packages/bluez/bluez-cups-backend_3.24.bb 6d3dd18f0576378f8bae0c3e251bce0ca132176e
+++ packages/bluez/bluez-cups-backend_3.24.bb 6d3dd18f0576378f8bae0c3e251bce0ca132176e
@@ -0,0 +1,26 @@
+require bluez-utils3.inc
+
+DEPENDS += "cups"
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --disable-alsa \
+ --enable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_${PN} = "cups"
============================================================
--- packages/bluez/bluez-gnome_0.15.bb b4b42d7a72595784b9e4a5628c4211153814d05b
+++ packages/bluez/bluez-gnome_0.15.bb b4b42d7a72595784b9e4a5628c4211153814d05b
@@ -0,0 +1,14 @@
+DESCRIPTION = "Bluetooth configuration applet"
+LICENSE = "GPL+LGPL"
+
+PR = "r1"
+
+DEPENDS = "dbus-glib gconf libnotify gtk+"
+RRECOMMENDS = "gnome-icon-theme"
+
+SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+inherit autotools pkgconfig gconf
+
+FILES_${PN} += "${datadir}/gconf"
+
============================================================
--- packages/bluez/bluez-gstreamer-plugin_3.24.bb f67c210c4018f045ec0a87f2baff07aefd2c19ae
+++ packages/bluez/bluez-gstreamer-plugin_3.24.bb f67c210c4018f045ec0a87f2baff07aefd2c19ae
@@ -0,0 +1,26 @@
+require bluez-utils3.inc
+
+DEPENDS += "gstreamer gst-plugins-base "
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --enable-alsa \
+ --disable-cups \
+ --enable-glib \
+ --enable-gstreamer \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so"
============================================================
--- packages/bluez/bluez-libs_3.24.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
+++ packages/bluez/bluez-libs_3.24.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
@@ -0,0 +1 @@
+require bluez-libs.inc
============================================================
--- packages/bluez/bluez-utils-alsa_3.24.bb b7eb82c734b71cf61ac35a052d87da836df665d4
+++ packages/bluez/bluez-utils-alsa_3.24.bb b7eb82c734b71cf61ac35a052d87da836df665d4
@@ -0,0 +1,24 @@
+require bluez-utils3.inc
+
+DEPENDS += "alsa-lib"
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --disable-hid2hci \
+ --enable-alsa \
+ --disable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${libdir}/alsa-lib/libasound*"
============================================================
--- packages/bluez/bluez-utils_3.24.bb e19b966dd298ba92c4980f3df32211c2eeffc8f1
+++ packages/bluez/bluez-utils_3.24.bb e19b966dd298ba92c4980f3df32211c2eeffc8f1
@@ -0,0 +1,30 @@
+require bluez-utils3.inc
+PR = "r1"
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --disable-alsa \
+ --disable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+CONFFILES_${PN} = " \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default/bluetooth \
+ "
+
+CONFFILES_${PN}-compat = " \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
============================================================
--- packages/distcc/files/distcc-avahi.patch df8cdab0a7e2910982955936c26053276101bc21
+++ packages/distcc/files/distcc-avahi.patch df8cdab0a7e2910982955936c26053276101bc21
@@ -0,0 +1,12305 @@
+--- distcc-2.18.3/aclocal.m4 1970-01-01 01:00:00.000000000 +0100
++++ distcc-2.18.3.lennart/aclocal.m4 2007-12-30 13:55:27.000000000 +0100
+@@ -0,0 +1,171 @@
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
++
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005 Free Software Foundation, Inc.
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++#
++# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_default([$1], [0.9.0])
++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
++ fi
++
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
++
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists. Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++ m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++ $3])dnl
++fi])
++
++
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$PKG_CONFIG"; then
++ if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ else
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ fi
++else
++ pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
++
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
++
++
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
++
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
++
++if test $pkg_failed = yes; then
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ else
++ %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list