[oe-commits] org.oe.dev merge of 'dfb5c206db460b0cf401c69649d294a5a1350610'
pfalcon commit
openembedded-commits at lists.openembedded.org
Mon Dec 31 01:09:02 UTC 2007
merge of 'dfb5c206db460b0cf401c69649d294a5a1350610'
and 'fac66456828796a81d9330011852754e1e4c364f'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: ddcc413146b226215e5f652d2c152bab4758f36d
ViewMTN: http://monotone.openembedded.org/revision/info/ddcc413146b226215e5f652d2c152bab4758f36d
Files:
1
packages/backsaver
packages/backsaver/files
packages/backsaver/backsaver_1.0.bb
packages/backsaver/files/Makefile
packages/backsaver/files/backsaver.c
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/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/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
packages/distcc/distcc_2.18.3.bb
packages/distcc/files/distcc
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.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/openmoko2/openmoko-terminal2_svn.bb
packages/qemu/qemu-gcc3-check.inc
packages/vte/vte_0.16.8.bb
packages/webkit/webkit-gtk_svn.bb
Diffs:
#
# mt diff -rdfb5c206db460b0cf401c69649d294a5a1350610 -rddcc413146b226215e5f652d2c152bab4758f36d
#
#
#
# add_dir "packages/backsaver"
#
# add_dir "packages/backsaver/files"
#
# add_file "packages/backsaver/backsaver_1.0.bb"
# content [0d0c4f9a9ba80e7aa02bea5496a3c61232e9fa5d]
#
# add_file "packages/backsaver/files/Makefile"
# content [00a197ea09957210ac9dc033925345efc4f70e57]
#
# add_file "packages/backsaver/files/backsaver.c"
# content [d7564187fea35403095f8066877e39ae7b23ca9e]
#
============================================================
--- packages/backsaver/backsaver_1.0.bb 0d0c4f9a9ba80e7aa02bea5496a3c61232e9fa5d
+++ packages/backsaver/backsaver_1.0.bb 0d0c4f9a9ba80e7aa02bea5496a3c61232e9fa5d
@@ -0,0 +1,14 @@
+DESCRIPTION = "Lightweight backlight saver daemon"
+SECTION = "base"
+LICENSE="GPL"
+
+PR = "r0"
+
+SRC_URI = "file://Makefile \
+ file://backsaver.c"
+
+S = ${WORKDIR}
+
+do_install () {
+ oe_runmake 'prefix=${D}' install
+}
============================================================
--- packages/backsaver/files/Makefile 00a197ea09957210ac9dc033925345efc4f70e57
+++ packages/backsaver/files/Makefile 00a197ea09957210ac9dc033925345efc4f70e57
@@ -0,0 +1,8 @@
+backsaver: backsaver.o
+
+backsaver.o: backsaver.c
+
+install:
+ install -d ${prefix}/usr/bin/
+ # Needs to be installed suid to access sysfs & dev/input
+ install -m 4755 backsaver ${prefix}/usr/bin/
============================================================
--- packages/backsaver/files/backsaver.c d7564187fea35403095f8066877e39ae7b23ca9e
+++ packages/backsaver/files/backsaver.c d7564187fea35403095f8066877e39ae7b23ca9e
@@ -0,0 +1,256 @@
+/*
+ * backsaver - Small backlight power saver daemon
+ *
+ * This app relies on contemporary Linux 2.6 intefaces, like
+ * backlight class dev and generic input devices. Legacy interfaces
+ * are not supported by design.
+ *
+ * Copyright (C) 2007, 2008 Paul Sokolovsky <pmiscml at gmail.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.
+ */
+
+#include <getopt.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int opt_verbose;
+int opt_timeout = 2;
+int opt_power;
+int opt_brightness = -1;
+
+char readbuf[256];
+fd_set read_fds;
+fd_set work_fds;
+int fds[32];
+
+int bl_state = 1;
+
+#define BL_PATH "/sys/class/backlight/"
+
+/* Backlight device properties */
+char bldev_brightness_path[256] = BL_PATH;
+char bldev_power_path[256] = BL_PATH;
+int bldev_max_brightness;
+int bldev_saved_brightness;
+int bldev_dim_brightness;
+
+void fatal(char *msg)
+{
+ fprintf(stderr, "%s\n", msg);
+ exit(1);
+}
+
+int sysfs_get_value(char *fname)
+{
+ char buf[64];
+ int fd = open(fname, O_RDONLY);
+ int sz = read(fd, buf, sizeof(buf) - 1);
+ buf[sz] = 0;
+ close(fd);
+ return atoi(buf);
+}
+
+void sysfs_set_value(char *fname, int val)
+{
+ char buf[64];
+ int fd = open(fname, O_WRONLY);
+ int sz = sprintf(buf, "%d\n", val);
+ write(fd, buf, sz);
+ close(fd);
+}
+
+char *bldev_scan()
+{
+ static char name[256];
+ DIR *dir;
+ struct dirent *de;
+ int more_than_one = 0;
+
+ dir = opendir(BL_PATH);
+ if (!dir)
+ fatal("Backlight device class does not seem to be support by kernel (" BL_PATH " is absent)");
+
+ *name = 0;
+ while (de = readdir(dir)) {
+ if (de->d_name[0] == '.')
+ continue;
+ if (*name == 0) {
+ strcpy(name, de->d_name);
+ } else {
+ more_than_one = 1;
+ break;
+ }
+ }
+
+ closedir(dir);
+ if (*name == 0)
+ fatal("There does not seem to be any backlight device available (" BL_PATH " is empty)");
+ if (more_than_one)
+ fatal("There seems to be several backlight devices available, use --device= option");
+
+ return name;
+}
+
+void bldev_init(char *bldev)
+{
+ strcat(bldev_brightness_path, bldev);
+ strcat(bldev_brightness_path, "/brightness");
+ strcat(bldev_power_path, bldev);
+ strcat(bldev_power_path, "/power");
+
+ char buf[PATH_MAX];
+ memcpy(buf, BL_PATH, sizeof(BL_PATH));
+ strcat(buf, bldev);
+ strcat(buf, "/max_brightness");
+ bldev_max_brightness = sysfs_get_value(buf);
+
+ bldev_dim_brightness = bldev_max_brightness * opt_brightness / 100;
+}
+
+void set_backlight(int state)
+{
+ if (!bl_state) {
+ if (opt_verbose)
+ printf("BL off\n");
+ if (opt_power) {
+ sysfs_set_value(bldev_power_path, 4);
+ } else {
+ bldev_saved_brightness = sysfs_get_value(bldev_brightness_path);
+ sysfs_set_value(bldev_brightness_path, bldev_dim_brightness);
+ }
+ } else {
+ if (opt_verbose)
+ printf("BL on\n");
+ if (opt_power) {
+ sysfs_set_value(bldev_power_path, 0);
+ } else {
+ sysfs_set_value(bldev_brightness_path, bldev_saved_brightness);
+ }
+ }
+}
+
+#define INPUT_PATH "/dev/input/"
+
+int main_loop(int argc, char *argv[], int argstart)
+{
+ fd_set read_fds;
+ struct timeval timeout;
+ int i, maxfd = 0, numfd = 0;
+
+ FD_ZERO(&read_fds);
+
+ if (argstart == argc) {
+ static char path[256] = INPUT_PATH;
+ DIR *dir;
+ struct dirent *de;
+ struct stat stat;
+
+ dir = opendir(INPUT_PATH);
+ if (!dir)
+ fatal("Cannot open generic input device directory (" INPUT_PATH " is absent)");
+
+ while (de = readdir(dir)) {
+ if (de->d_name[0] == '.')
+ continue;
+ strcpy(path + sizeof(INPUT_PATH) - 1, de->d_name);
+
+ if (lstat(path, &stat))
+ fatal("Cannot stat input device to monitor");
+ if (S_ISLNK(stat.st_mode)) {
+ if (opt_verbose)
+ printf("Skipping symlink %s\n", path);
+ continue;
+ }
+ if (opt_verbose)
+ printf("Using %s\n", path);
+
+ int fd = open(path, O_RDONLY);
+ if (fd == -1)
+ fatal("Cannot open input device to monitor");
+ if (fd > maxfd)
+ maxfd = fd;
+ fds[numfd++] = fd;
+ FD_SET(fd, &read_fds);
+ }
+
+ closedir(dir);
+ } else {
+ for (i = argstart; i < argc; i++) {
+ if (opt_verbose)
+ printf("Using: %s\n", argv[i]);
+ int fd = open(argv[i], O_RDONLY);
+ if (fd == -1)
+ fatal("Cannot open input device to monitor");
+ if (fd > maxfd)
+ maxfd = fd;
+ fds[numfd++] = fd;
+ FD_SET(fd, &read_fds);
+ }
+ }
+
+ timeout.tv_usec = 0;
+
+ while (1) {
+ memcpy(&work_fds, &read_fds, sizeof(read_fds));
+ timeout.tv_sec = opt_timeout;
+ i = select(maxfd + 1, &work_fds, NULL, NULL, &timeout);
+ if (opt_verbose)
+ printf("Select returned: %d\n", i);
+ if (i > 0) {
+ if (!bl_state) {
+ bl_state = 1;
+ set_backlight(bl_state);
+ }
+ for (i = 0; i < numfd; i++) {
+ if (FD_ISSET(fds[i], &work_fds)) {
+ int sz = read(fds[i], readbuf, sizeof(readbuf));
+ if (opt_verbose)
+ printf("Discarded %d bytes from fd %d\n", sz, fds[i]);
+ }
+ }
+ } else {
+ if (bl_state) {
+ bl_state = 0;
+ set_backlight(bl_state);
+ }
+ }
+
+ }
+}
+
+struct option options[] = {
+ { "verbose", no_argument, &opt_verbose, 1 },
+ { "timeout", required_argument, NULL, 't' },
+ { "power", no_argument, &opt_power, 1 },
+ { "brightness", required_argument, NULL, 'b' },
+ NULL
+};
+int main(int argc, char *argv[])
+{
+ int opt;
+ while ((opt = getopt_long(argc, argv, "?h", options, NULL)) != -1) {
+ switch (opt) {
+ case 't':
+ opt_timeout = atoi(optarg);
+ break;
+ case 'b':
+ opt_brightness = atoi(optarg);
+ break;
+ }
+ }
+ printf("%d\n", optind);
+
+ char *bldev = bldev_scan();
+ bldev_init(bldev);
+
+ return main_loop(argc, argv, optind);
+}
#
# mt diff -rfac66456828796a81d9330011852754e1e4c364f -rddcc413146b226215e5f652d2c152bab4758f36d
#
#
#
# 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/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 [153189a76a51142fd7ddc71a5f22d17e03aa0009]
#
# 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 "packages/distcc/distcc_2.18.3.bb"
# from [0f31a836477297ae3e9cfc2cf2c9ceabe38d85d3]
# to [980168c7626a06af4ee3c091da786c662f16fad8]
#
# patch "packages/distcc/files/distcc"
# from [d9b7e67dcbc6dc515b349c006234d703497781ae]
# to [3c9d22e56660bcb0b9475bd4374467577d19deee]
#
# 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.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/openmoko2/openmoko-terminal2_svn.bb"
# from [b2c47944ba3c9a3b6d9e1869372029f3314a0a23]
# to [c92f27f4866500c78b42fc39276964920d6967bc]
#
# patch "packages/qemu/qemu-gcc3-check.inc"
# from [2e11e76ecd0c388cdcfd1319c8601c429ba5888e]
# to [ab9405e1e7f0697d39ad932818e4d113c0fbd3ea]
#
# 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
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
++
++$$1_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++_PKG_TEXT
++])],
++ [$4])
++elif test $pkg_failed = untried; then
++ ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++_PKG_TEXT
++
++To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++ [$4])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ AC_MSG_RESULT([yes])
++ ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
++
++m4_include([acinclude.m4])
+--- distcc-2.18.3/configure.ac 2004-11-30 12:34:32.000000000 +0100
++++ distcc-2.18.3.lennart/configure.ac 2007-12-30 15:45:58.000000000 +0100
+@@ -386,6 +386,18 @@ AC_CHECK_MEMBER([struct sockaddr_storage
+ AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [define if you have struct sockaddr_storage]),,
+ [#include <sys/socket.h>])
+
++dnl check for avahi
++PKG_CHECK_MODULES(AVAHI, [avahi-client >= 0.6.5],
++[AC_DEFINE(HAVE_AVAHI, 1, [defined if Avahi is available])
++CFLAGS="$CFLAGS $AVAHI_CFLAGS"
++LIBS="$LIBS $AVAHI_LIBS"
++ZEROCONF_DISTCC_OBJS="src/zeroconf.o src/gcc-id.o"
++ZEROCONF_DISTCCD_OBJS="src/zeroconf-reg.o src/gcc-id.o"],
++[ZEROCONF_DISTCC_OBJS=""
++ZEROCONF_DISTCCD_OBJS=""])
++AC_SUBST(ZEROCONF_DISTCC_OBJS)
++AC_SUBST(ZEROCONF_DISTCCD_OBJS)
++
+ dnl ##### Output
+ AC_SUBST(docdir)
+ AC_SUBST(CFLAGS)
+--- distcc-2.18.3/configure 2004-11-30 12:34:40.000000000 +0100
++++ distcc-2.18.3.lennart/configure 2007-12-30 16:20:44.000000000 +0100
+@@ -1,27 +1,56 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59 for distcc 2.18.3.
++# Generated by GNU Autoconf 2.61 for distcc 2.18.3.
+ #
+ # Report bugs to <distcc at lists.samba.org>.
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+ ## M4sh Initialization. ##%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list