From c681b0610fafb1e9e7f84580786fa91f607a7edf Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 1 Apr 2009 20:49:49 -0400 Subject: busybox 1.13.2: Add more upstream patches, bump PR This adds the awk, killall, printf, syslogd, top24, unzip and wget patches from http://busybox.net/downloads/fixes-1.13.2/ --- .../busybox-1.13.2/busybox-1.13.2-awk.patch | 46 ++++++++++++++++++++++ .../busybox-1.13.2/busybox-1.13.2-killall.patch | 17 ++++++++ .../busybox-1.13.2/busybox-1.13.2-printf.patch | 21 ++++++++++ .../busybox-1.13.2/busybox-1.13.2-syslogd.patch | 30 ++++++++++++++ .../busybox-1.13.2/busybox-1.13.2-top24.patch | 12 ++++++ .../busybox-1.13.2/busybox-1.13.2-unzip.patch | 12 ++++++ .../busybox-1.13.2/busybox-1.13.2-wget.patch | 41 +++++++++++++++++++ recipes/busybox/busybox_1.13.2.bb | 9 ++++- 8 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch create mode 100644 recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch new file mode 100644 index 0000000000..0a5e6806dd --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-awk.patch @@ -0,0 +1,46 @@ +diff -urpN busybox-1.13.2/editors/awk.c busybox-1.13.2-awk/editors/awk.c +--- busybox-1.13.2/editors/awk.c 2008-11-09 18:28:21.000000000 +0100 ++++ busybox-1.13.2-awk/editors/awk.c 2009-02-26 12:17:05.000000000 +0100 +@@ -392,8 +392,12 @@ static const uint16_t PRIMES[] ALIGN2 = + + + /* Globals. Split in two parts so that first one is addressed +- * with (mostly short) negative offsets */ ++ * with (mostly short) negative offsets. ++ * NB: it's unsafe to put members of type "double" ++ * into globals2 (gcc may fail to align them). ++ */ + struct globals { ++ double t_double; + chain beginseq, mainseq, endseq; + chain *seq; + node *break_ptr, *continue_ptr; +@@ -442,16 +446,16 @@ struct globals2 { + tsplitter exec_builtin__tspl; + + /* biggest and least used members go last */ +- double t_double; + tsplitter fsplitter, rsplitter; + }; + #define G1 (ptr_to_globals[-1]) + #define G (*(struct globals2 *)ptr_to_globals) + /* For debug. nm --size-sort awk.o | grep -vi ' [tr] ' */ +-/* char G1size[sizeof(G1)]; - 0x6c */ +-/* char Gsize[sizeof(G)]; - 0x1cc */ ++/*char G1size[sizeof(G1)]; - 0x74 */ ++/*char Gsize[sizeof(G)]; - 0x1c4 */ + /* Trying to keep most of members accessible with short offsets: */ +-/* char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */ ++/*char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */ ++#define t_double (G1.t_double ) + #define beginseq (G1.beginseq ) + #define mainseq (G1.mainseq ) + #define endseq (G1.endseq ) +@@ -479,7 +483,6 @@ struct globals2 { + #define t_info (G.t_info ) + #define t_tclass (G.t_tclass ) + #define t_string (G.t_string ) +-#define t_double (G.t_double ) + #define t_lineno (G.t_lineno ) + #define t_rollback (G.t_rollback ) + #define intvar (G.intvar ) diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch new file mode 100644 index 0000000000..9524f5281a --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-killall.patch @@ -0,0 +1,17 @@ +--- busybox-1.13.2/include/libbb.h Wed Dec 31 04:06:45 2008 ++++ busybox-1.13.2-killall/include/libbb.h Sat Feb 14 02:41:18 2009 +@@ -1275,7 +1275,13 @@ + PSSCAN_UTIME = 1 << 13, + PSSCAN_TTY = 1 << 14, + PSSCAN_SMAPS = (1 << 15) * ENABLE_FEATURE_TOPMEM, +- PSSCAN_ARGVN = (1 << 16) * (ENABLE_PGREP || ENABLE_PKILL || ENABLE_PIDOF), ++ /* NB: used by find_pid_by_name(). Any applet using it ++ * needs to be mentioned here. */ ++ PSSCAN_ARGVN = (1 << 16) * (ENABLE_KILLALL ++ || ENABLE_PGREP || ENABLE_PKILL ++ || ENABLE_PIDOF ++ || ENABLE_SESTATUS ++ ), + USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,) + PSSCAN_START_TIME = 1 << 18, + PSSCAN_CPU = 1 << 19, diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch new file mode 100644 index 0000000000..281d457065 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-printf.patch @@ -0,0 +1,21 @@ +diff -urpN busybox-1.13.2/coreutils/printf.c busybox-1.13.2-printf/coreutils/printf.c +--- busybox-1.13.2/coreutils/printf.c 2008-12-31 04:06:45.000000000 +0100 ++++ busybox-1.13.2-printf/coreutils/printf.c 2009-03-03 15:13:12.000000000 +0100 +@@ -139,14 +139,14 @@ static void print_direc(char *format, un + char saved; + char *have_prec, *have_width; + ++ saved = format[fmt_length]; ++ format[fmt_length] = '\0'; ++ + have_prec = strstr(format, ".*"); + have_width = strchr(format, '*'); + if (have_width - 1 == have_prec) + have_width = NULL; + +- saved = format[fmt_length]; +- format[fmt_length] = '\0'; +- + switch (format[fmt_length - 1]) { + case 'c': + printf(format, *argument); diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch new file mode 100644 index 0000000000..1c24cdcc55 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-syslogd.patch @@ -0,0 +1,30 @@ +diff -urpN busybox-1.13.2/sysklogd/syslogd.c busybox-1.13.2-syslogd/sysklogd/syslogd.c +--- busybox-1.13.2/sysklogd/syslogd.c 2008-11-09 18:28:03.000000000 +0100 ++++ busybox-1.13.2-syslogd/sysklogd/syslogd.c 2009-03-08 02:03:24.000000000 +0100 +@@ -301,17 +301,23 @@ static void log_locally(time_t now, char + } + #endif + if (G.logFD >= 0) { ++ /* Reopen log file every second. This allows admin ++ * to delete the file and not worry about restarting us. ++ * This costs almost nothing since it happens ++ * _at most_ once a second. ++ */ + if (!now) + now = time(NULL); + if (G.last_log_time != now) { +- G.last_log_time = now; /* reopen log file every second */ ++ G.last_log_time = now; + close(G.logFD); + goto reopen; + } + } else { + reopen: +- G.logFD = device_open(G.logFilePath, O_WRONLY | O_CREAT +- | O_NOCTTY | O_APPEND | O_NONBLOCK); ++ G.logFD = open(G.logFilePath, O_WRONLY | O_CREAT ++ | O_NOCTTY | O_APPEND | O_NONBLOCK, ++ 0666); + if (G.logFD < 0) { + /* cannot open logfile? - print to /dev/console then */ + int fd = device_open(DEV_CONSOLE, O_WRONLY | O_NOCTTY | O_NONBLOCK); diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch new file mode 100644 index 0000000000..25ee861593 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-top24.patch @@ -0,0 +1,12 @@ +diff -urpN busybox-1.13.2/procps/top.c busybox-1.13.2-top24/procps/top.c +--- busybox-1.13.2/procps/top.c 2008-11-09 18:28:20.000000000 +0100 ++++ busybox-1.13.2-top24/procps/top.c 2009-03-02 22:24:31.000000000 +0100 +@@ -200,7 +200,7 @@ static NOINLINE int read_cpu_jiffy(FILE + &p_jif->usr, &p_jif->nic, &p_jif->sys, &p_jif->idle, + &p_jif->iowait, &p_jif->irq, &p_jif->softirq, + &p_jif->steal); +- if (ret > 4) { ++ if (ret >= 4) { + p_jif->total = p_jif->usr + p_jif->nic + p_jif->sys + p_jif->idle + + p_jif->iowait + p_jif->irq + p_jif->softirq + p_jif->steal; + /* procps 2.x does not count iowait as busy time */ diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch new file mode 100644 index 0000000000..6b3f713ac5 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-unzip.patch @@ -0,0 +1,12 @@ +diff -urpN busybox-1.13.2/archival/unzip.c busybox-1.13.2-unzip/archival/unzip.c +--- busybox-1.13.2/archival/unzip.c 2008-11-09 18:28:02.000000000 +0100 ++++ busybox-1.13.2-unzip/archival/unzip.c 2009-02-26 12:17:21.000000000 +0100 +@@ -140,7 +140,7 @@ struct BUG_cde_header_must_be_16_bytes { + }; + + #define FIX_ENDIANNESS_CDE(cde_header) do { \ +- (cde_header).formatted.cds_offset = SWAP_LE16((cde_header).formatted.cds_offset); \ ++ (cde_header).formatted.cds_offset = SWAP_LE32((cde_header).formatted.cds_offset); \ + } while (0) + + enum { zip_fd = 3 }; diff --git a/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch new file mode 100644 index 0000000000..862467fd68 --- /dev/null +++ b/recipes/busybox/busybox-1.13.2/busybox-1.13.2-wget.patch @@ -0,0 +1,41 @@ +diff -urpN busybox-1.13.2/networking/wget.c busybox-1.13.2-wget/networking/wget.c +--- busybox-1.13.2/networking/wget.c 2008-11-09 18:27:59.000000000 +0100 ++++ busybox-1.13.2-wget/networking/wget.c 2009-03-02 16:07:12.000000000 +0100 +@@ -417,15 +417,17 @@ int wget_main(int argc UNUSED_PARAM, cha + KEY_content_length = 1, KEY_transfer_encoding, KEY_chunked, KEY_location + }; + enum { +- WGET_OPT_CONTINUE = 0x1, +- WGET_OPT_SPIDER = 0x2, +- WGET_OPT_QUIET = 0x4, +- WGET_OPT_OUTNAME = 0x8, +- WGET_OPT_PREFIX = 0x10, +- WGET_OPT_PROXY = 0x20, +- WGET_OPT_USER_AGENT = 0x40, +- WGET_OPT_PASSIVE = 0x80, +- WGET_OPT_HEADER = 0x100, ++ WGET_OPT_CONTINUE = (1 << 0), ++ WGET_OPT_SPIDER = (1 << 1), ++ WGET_OPT_QUIET = (1 << 2), ++ WGET_OPT_OUTNAME = (1 << 3), ++ WGET_OPT_PREFIX = (1 << 4), ++ WGET_OPT_PROXY = (1 << 5), ++ WGET_OPT_USER_AGENT = (1 << 6), ++ WGET_OPT_RETRIES = (1 << 7), ++ WGET_OPT_NETWORK_READ_TIMEOUT = (1 << 8), ++ WGET_OPT_PASSIVE = (1 << 9), ++ WGET_OPT_HEADER = (1 << 10), + }; + #if ENABLE_FEATURE_WGET_LONG_OPTIONS + static const char wget_longopts[] ALIGN1 = +@@ -437,6 +439,10 @@ int wget_main(int argc UNUSED_PARAM, cha + "directory-prefix\0" Required_argument "P" + "proxy\0" Required_argument "Y" + "user-agent\0" Required_argument "U" ++ /* Ignored: */ ++ // "tries\0" Required_argument "t" ++ // "timeout\0" Required_argument "T" ++ /* Ignored (we always use PASV): */ + "passive-ftp\0" No_argument "\xff" + "header\0" Required_argument "\xfe" + ; diff --git a/recipes/busybox/busybox_1.13.2.bb b/recipes/busybox/busybox_1.13.2.bb index 8ecbc1e0e8..602e782d4d 100644 --- a/recipes/busybox/busybox_1.13.2.bb +++ b/recipes/busybox/busybox_1.13.2.bb @@ -1,13 +1,20 @@ require busybox.inc -PR = "r17" +PR = "r18" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + file://busybox-1.13.2-awk.patch;patch=1 \ file://busybox-1.13.2-depmod.patch;patch=1 \ file://busybox-1.13.2-init.patch;patch=1 \ + file://busybox-1.13.2-killall.patch;patch=1 \ file://busybox-1.13.2-mdev.patch;patch=1 \ file://busybox-1.13.2-modprobe.patch;patch=1 \ + file://busybox-1.13.2-printf.patch;patch=1 \ + file://busybox-1.13.2-syslogd.patch;patch=1 \ file://busybox-1.13.2-tar.patch;patch=1 \ + file://busybox-1.13.2-top24.patch;patch=1 \ + file://busybox-1.13.2-unzip.patch;patch=1 \ + file://busybox-1.13.2-wget.patch;patch=1 \ \ file://udhcpscript.patch;patch=1 \ file://udhcpc-fix-nfsroot.patch;patch=1 \ -- cgit v1.2.3 From 71f70d7be487035d59d9bc0f04bcb621ef615b15 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 22 Apr 2009 17:00:16 +0200 Subject: dbus: bump default timeout value --- recipes/dbus/dbus.inc | 2 +- recipes/dbus/dbus_1.2.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/dbus/dbus.inc b/recipes/dbus/dbus.inc index 047b33a71c..2a4b19699f 100644 --- a/recipes/dbus/dbus.inc +++ b/recipes/dbus/dbus.inc @@ -27,7 +27,7 @@ EXTRA_OECONF = "\ --disable-doxygen-docs \ --with-xml=expat \ --with-x \ - --with-dbus-default-reply-timeout=60000 \ + --with-dbus-default-reply-timeout=200000 \ " do_install_append() { diff --git a/recipes/dbus/dbus_1.2.1.bb b/recipes/dbus/dbus_1.2.1.bb index 2a663f4bfa..7746c40062 100644 --- a/recipes/dbus/dbus_1.2.1.bb +++ b/recipes/dbus/dbus_1.2.1.bb @@ -1,3 +1,3 @@ include dbus.inc -PR = "r10" +PR = "r11" -- cgit v1.2.3 From 82ede6b24b408cdeabde96dd0023919867ada753 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 22 Apr 2009 17:18:25 +0200 Subject: bustle-dbus-monitor: new recipe; monitoring utility for the Bustle D-Bus suite TODO: add eavesdropping magic in postinstall/prerm --- recipes/bustle/bustle-dbus-monitor_0.2.0.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 recipes/bustle/bustle-dbus-monitor_0.2.0.bb diff --git a/recipes/bustle/bustle-dbus-monitor_0.2.0.bb b/recipes/bustle/bustle-dbus-monitor_0.2.0.bb new file mode 100644 index 0000000000..4d4768f4de --- /dev/null +++ b/recipes/bustle/bustle-dbus-monitor_0.2.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "The monitoring utilitiy for the Bustle D-Bus diagram application." +HOMEPAGE = "http://www.willthompson.co.uk/bustle" +DEPENDS = "dbus glib-2.0" +LICENSE = "LGPL" +SECTION = "console/network" + +SRC_URI = "http://www.willthompson.co.uk/bustle/releases/bustle-${PV}.tar.gz" +S = "${WORKDIR}/bustle-${PV}" + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} `pkg-config --cflags --libs dbus-1 glib-2.0` -o bustle-dbus-monitor bustle-dbus-monitor.c +} + +do_install() { + install -d ${D}${sbindir} + install -m 0755 bustle-dbus-monitor ${D}${sbindir} +} + +FILES_${PN} += "${sbindir}" -- cgit v1.2.3 From 9219f40b58de4d9588c5a2480209d5ee1d3ab5d6 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 22 Apr 2009 04:12:57 +0000 Subject: linux.inc: unset CONFIG_LOCALVERSION_AUTO to not get 2.6.27.2-svn8826-dirty26 like names Year ago we removed CONFIG_LOCALVERSION from .config to get more sane names of kernels. Today with 2.6.27.2 I got 2.6.27.2-svn8826-dirty26 kernel which was 2.6.27.2-svn8826-dirty9 on device so no modules ;( This patch changes this by unsetting CONFIG_LOCALVERSION_AUTO variable. Signed-off-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Otavio Salvador --- recipes/linux/linux.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc index 984efac4d3..5a4a11fecf 100644 --- a/recipes/linux/linux.inc +++ b/recipes/linux/linux.inc @@ -98,8 +98,11 @@ do_configure_prepend() { -e '/CONFIG_LOGO=/d' \ -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \ -e '/CONFIG_LOCALVERSION/d' \ + -e '/CONFIG_LOCALVERSION_AUTO/d' \ < '${WORKDIR}/defconfig' >>'${S}/.config' + echo 'CONFIG_LOCALVERSION=""' >>${S}/.config + echo '# CONFIG_LOCALVERSION_AUTO is not set' >>${S}/.config # # root-over-nfs-over-usb-eth support. Limited, but should cover some cases. # Enable this by setting a proper CMDLINE_NFSROOT_USB. -- cgit v1.2.3 From 6cf8a2695b13601dab36cec36811355a96040618 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 22 Apr 2009 20:25:17 +0200 Subject: buildbot: config of my buildbot running on http://home.haerwu.biz:8010/ --- contrib/buildbot/README | 4 + contrib/buildbot/master.cfg | 153 +++++++++++++++++++++++++++++ contrib/buildbot/scripts/full-oe-autobuild | 62 ++++++++++++ 3 files changed, 219 insertions(+) create mode 100644 contrib/buildbot/README create mode 100644 contrib/buildbot/master.cfg create mode 100755 contrib/buildbot/scripts/full-oe-autobuild diff --git a/contrib/buildbot/README b/contrib/buildbot/README new file mode 100644 index 0000000000..b5506a363b --- /dev/null +++ b/contrib/buildbot/README @@ -0,0 +1,4 @@ +This directory contains buildbot config used by Marcin Juszkiewicz. + +Buildbot homepage: http://www.buildbot.net/ +Marcin's buildbot: http://home.haerwu.biz:8010/ diff --git a/contrib/buildbot/master.cfg b/contrib/buildbot/master.cfg new file mode 100644 index 0000000000..537eb8110e --- /dev/null +++ b/contrib/buildbot/master.cfg @@ -0,0 +1,153 @@ +def runOEImage(factory, machine, image, libc): + defaultenv['ANGSTROMLIBC'] = libc + factory.addStep(ShellCommand, description=["Building", machine, image], command=["/home/buildbot/scripts/full-oe-autobuild", image, machine], env=copy.copy(defaultenv), timeout=10000) + +import copy + +builders = [] +defaultenv = {} + +config = BuildmasterConfig = {} + +config['projectName'] = "HaeRWu buildbot" +config['buildbotURL'] = "http://localhost:8010/" + +from buildbot.buildslave import BuildSlave +from buildbot.changes.pb import PBChangeSource +from buildbot.scheduler import Scheduler +from buildbot.scheduler import Periodic +from buildbot.scheduler import Nightly +from buildbot.process import factory +from buildbot.process import buildstep as step +from buildbot.steps.source import SVN +from buildbot.steps.python_twisted import Trial +from buildbot.steps.shell import Compile, ShellCommand +from buildbot.steps import source, shell + +config['slaves'] = [BuildSlave("homeQuad", "BOT-PASSWORD")] +config['slavePortnum'] = 9989 + +config['change_source'] = PBChangeSource() + +config['schedulers'] = [] + +config['schedulers'].append(Nightly(name="Angstrom glibc full build", + hour=23, minute=0, dayOfWeek=[0,2,4], + builderNames=["angstrom_glibc_full_build"])) + +config['schedulers'].append(Nightly(name="Angstrom glibc incremental build", + hour=5, minute=0, dayOfWeek=[0,2,4], + builderNames=["angstrom_glibc_incremental_build"])) + +config['schedulers'].append(Nightly(name="Angstrom uclibc full build", + hour=23, minute=0, dayOfWeek=[1,3,5], + builderNames=["angstrom_uclibc_full_build"])) + +config['schedulers'].append(Nightly(name="Angstrom uclibc incremental build", + hour=5, minute=0, dayOfWeek=[1,3,5], + builderNames=["angstrom_uclibc_incremental_build"])) + + +angstrom_glibc_incremental_build = factory.BuildFactory() +angstrom_glibc_incremental_build.addStep(source.Git(repourl="git://git.openembedded.net/openembedded", branch='stable/2009', mode='update')) + +angstrom_glibc_incremental_build.addStep(ShellCommand, description=["Cleaning", "previous", "images"], command="/bin/rm tmp/deploy/images/*/*/*rootfs* || /bin/true", timeout=600) +angstrom_glibc_incremental_build.addStep(ShellCommand, description=["Cleaning", "previous", "images", "step 2"], command="/bin/rm -rf tmp/deploy/images/*/*/*testlab* || /bin/true", timeout=600) +runOEImage(angstrom_glibc_incremental_build, 'at91sam9263ek', 'base-image', 'glibc') +runOEImage(angstrom_glibc_incremental_build, 'at91sam9263ek', 'console-image', 'glibc') +runOEImage(angstrom_glibc_incremental_build, 'at91sam9263ek', 'x11-image', 'glibc') +runOEImage(angstrom_glibc_incremental_build, 'beagleboard', 'base-image', 'glibc') +runOEImage(angstrom_glibc_incremental_build, 'beagleboard', 'console-image', 'glibc') +runOEImage(angstrom_glibc_incremental_build, 'beagleboard', 'x11-image', 'glibc') +runOEImage(angstrom_glibc_incremental_build, 'qemux86', 'base-image', 'glibc') +runOEImage(angstrom_glibc_incremental_build, 'qemux86', 'console-image', 'glibc') +runOEImage(angstrom_glibc_incremental_build, 'qemux86', 'x11-image', 'glibc') + +angstrom_glibc_full_build = factory.BuildFactory() +angstrom_glibc_full_build.addStep(source.Git(repourl="git://git.openembedded.net/openembedded", branch='stable/2009', mode='update')) + +angstrom_glibc_full_build.addStep(ShellCommand, description=["Cleaning", "previous", "images"], command="/bin/rm tmp/deploy/images/*/*/*rootfs* || /bin/true", timeout=600) +angstrom_glibc_full_build.addStep(ShellCommand, description=["Cleaning", "previous", "images", "step 2"], command="/bin/rm -rf tmp/deploy/images/*/*/*testlab* || /bin/true", timeout=600) +runOEImage(angstrom_glibc_full_build, 'at91sam9263ek', 'base-image', 'glibc') +runOEImage(angstrom_glibc_full_build, 'at91sam9263ek', 'console-image', 'glibc') +runOEImage(angstrom_glibc_full_build, 'at91sam9263ek', 'x11-image', 'glibc') +runOEImage(angstrom_glibc_full_build, 'beagleboard', 'base-image', 'glibc') +runOEImage(angstrom_glibc_full_build, 'beagleboard', 'console-image', 'glibc') +runOEImage(angstrom_glibc_full_build, 'beagleboard', 'x11-image', 'glibc') +runOEImage(angstrom_glibc_full_build, 'qemux86', 'base-image', 'glibc') +runOEImage(angstrom_glibc_full_build, 'qemux86', 'console-image', 'glibc') +runOEImage(angstrom_glibc_full_build, 'qemux86', 'x11-image', 'glibc') + +angstrom_uclibc_incremental_build = factory.BuildFactory() +angstrom_uclibc_incremental_build.addStep(source.Git(repourl="git://git.openembedded.net/openembedded", branch='stable/2009', mode='update')) + +angstrom_uclibc_incremental_build.addStep(ShellCommand, description=["Cleaning", "previous", "images"], command="/bin/rm tmp/deploy/images/*/*/*rootfs* || /bin/true", timeout=600) +angstrom_uclibc_incremental_build.addStep(ShellCommand, description=["Cleaning", "previous", "images", "step 2"], command="/bin/rm -rf tmp/deploy/images/*/*/*testlab* || /bin/true", timeout=600) +runOEImage(angstrom_uclibc_incremental_build, 'atngw100', 'base-image', 'uclibc') +runOEImage(angstrom_uclibc_incremental_build, 'atngw100', 'console-image', 'uclibc') +runOEImage(angstrom_uclibc_incremental_build, 'atngw100', 'x11-image', 'uclibc') +runOEImage(angstrom_uclibc_incremental_build, 'at91sam9263ek', 'base-image', 'uclibc') +runOEImage(angstrom_uclibc_incremental_build, 'at91sam9263ek', 'console-image', 'uclibc') +runOEImage(angstrom_uclibc_incremental_build, 'at91sam9263ek', 'x11-image', 'uclibc') +runOEImage(angstrom_uclibc_incremental_build, 'beagleboard', 'base-image', 'uclibc') +runOEImage(angstrom_uclibc_incremental_build, 'beagleboard', 'console-image', 'uclibc') +runOEImage(angstrom_uclibc_incremental_build, 'beagleboard', 'x11-image', 'uclibc') +runOEImage(angstrom_uclibc_incremental_build, 'qemux86', 'base-image', 'uclibc') +runOEImage(angstrom_uclibc_incremental_build, 'qemux86', 'console-image', 'uclibc') +runOEImage(angstrom_uclibc_incremental_build, 'qemux86', 'x11-image', 'uclibc') + +angstrom_uclibc_full_build = factory.BuildFactory() +angstrom_uclibc_full_build.addStep(source.Git(repourl="git://git.openembedded.net/openembedded", branch='stable/2009', mode='update')) + +angstrom_uclibc_full_build.addStep(ShellCommand, description=["Cleaning", "previous", "images"], command="/bin/rm tmp/deploy/images/*/*/*rootfs* || /bin/true", timeout=600) +angstrom_uclibc_full_build.addStep(ShellCommand, description=["Cleaning", "previous", "images", "step 2"], command="/bin/rm -rf tmp/deploy/images/*/*/*testlab* || /bin/true", timeout=600) +runOEImage(angstrom_uclibc_full_build, 'atngw100', 'base-image', 'uclibc') +runOEImage(angstrom_uclibc_full_build, 'atngw100', 'console-image', 'uclibc') +runOEImage(angstrom_uclibc_full_build, 'atngw100', 'x11-image', 'uclibc') +runOEImage(angstrom_uclibc_full_build, 'at91sam9263ek', 'base-image', 'uclibc') +runOEImage(angstrom_uclibc_full_build, 'at91sam9263ek', 'console-image', 'uclibc') +runOEImage(angstrom_uclibc_full_build, 'at91sam9263ek', 'x11-image', 'uclibc') +runOEImage(angstrom_uclibc_full_build, 'beagleboard', 'base-image', 'uclibc') +runOEImage(angstrom_uclibc_full_build, 'beagleboard', 'console-image', 'uclibc') +runOEImage(angstrom_uclibc_full_build, 'beagleboard', 'x11-image', 'uclibc') +runOEImage(angstrom_uclibc_full_build, 'qemux86', 'base-image', 'uclibc') +runOEImage(angstrom_uclibc_full_build, 'qemux86', 'console-image', 'uclibc') +runOEImage(angstrom_uclibc_full_build, 'qemux86', 'x11-image', 'uclibc') +#--------------------------------------------------------------------- + +build_agf = { + 'name': "angstrom_glibc_full_build", + 'slavename': "homeQuad", + 'builddir': "angstrom_glibc_full_build", + 'factory': angstrom_glibc_full_build, +} + +build_agi = { + 'name': "angstrom_glibc_incremental_build", + 'slavename': "homeQuad", + 'builddir': "angstrom_glibc_incremental_build", + 'factory': angstrom_glibc_incremental_build, +} +build_auf = { + 'name': "angstrom_uclibc_full_build", + 'slavename': "homeQuad", + 'builddir': "angstrom_uclibc_full_build", + 'factory': angstrom_uclibc_full_build, +} + +build_aui = { + 'name': "angstrom_uclibc_incremental_build", + 'slavename': "homeQuad", + 'builddir': "angstrom_uclibc_incremental_build", + 'factory': angstrom_uclibc_incremental_build, +} + +config['builders'] = [build_agf, build_agi, build_auf, build_aui ] +config['status'] = [] +config['debugPassword'] = "" + +from buildbot.status import html + +config['status'].append(html.Waterfall(http_port=8010)) +config['status'].append(html.Waterfall(http_port=8011, allowForce=False)) + diff --git a/contrib/buildbot/scripts/full-oe-autobuild b/contrib/buildbot/scripts/full-oe-autobuild new file mode 100755 index 0000000000..65605f0a7b --- /dev/null +++ b/contrib/buildbot/scripts/full-oe-autobuild @@ -0,0 +1,62 @@ +#!/bin/sh + +# Poky Automated Build Server Enviroment Setup Script +# +# Copyright (C) 2006-2007 OpenedHand Ltd. +# Adapted to OpenEmbedded by Marcin Juszkiewicz in 2008. +# +# 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 + +CURRDIR=`pwd` + +BB_DIR=$PWD/bitbake + +PATH=$BB_DIR/bin:$PATH + +# Don't export TARGET_ARCH - it *will* cause build failures +export PATH LD_LIBRARY_PATH + +export BBPATH=`pwd` +export BB_ENV_EXTRAWHITE="MACHINE ANGSTROMLIBC" + +CONFFILE="./conf/local.conf" + +umask 000 + +rm conf/auto.conf + +CONFFILE="./conf/local.conf" + +if [ ! -e "$CONFFILE" ]; then + if [ ! -d "./conf" ]; then + mkdir -p "./conf" + fi + echo "BBFILES = '$PWD/recipes/*/*.bb'" > "$CONFFILE" + echo 'DISTRO = "angstrom-2008.1"' >> "$CONFFILE" + echo 'BB_NUMBER_THREADS = "6"' >> "$CONFFILE" + echo 'PARALLEL_MAKE = "-j 8"' >> "$CONFFILE" + echo 'DL_DIR = "/home/hrw/devel/sources/dl_dir/"' >> "$CONFFILE" + echo 'DEBIAN_MIRROR = "ftp://ftp.pl.debian.org/pub/debian/pool"' >> "$CONFFILE" + echo 'INHERIT += "rm_work"' >> "$CONFFILE" + echo 'BBINCLUDELOGS = "1"' >> "$CONFFILE" +fi + +touch ./conf/local.conf + +MACHINE=$2 nice ionice -c3 bitbake $1 + +retval=$? + +exit $retval -- cgit v1.2.3 From 57cd858103e99a019a5264840cd412be700e2299 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Fri, 27 Mar 2009 19:37:53 +0300 Subject: dialog: update version 1.0-20050306 -> 1.1-20080819 Previous version is obsolete and can't be found on official FTP, it is also removed from Debian archives so the packages failed to build if not using some distro-specific mirror. Hence, update version removing the old one along the way. Acked-by: Koen Kooi --- conf/checksums.ini | 6 +- recipes/dialog/dialog-1.0-20050306/configure.patch | 37 - recipes/dialog/dialog-1.0-20050306/m4.patch | 6979 -------------------- recipes/dialog/dialog-1.0-20050306/templates.patch | 25 - recipes/dialog/dialog-static_1.0-20050306.bb | 4 - recipes/dialog/dialog-static_1.1-20080819.bb | 3 + recipes/dialog/dialog.inc | 9 +- recipes/dialog/dialog_1.1-20080819.bb | 1 + 8 files changed, 12 insertions(+), 7052 deletions(-) delete mode 100644 recipes/dialog/dialog-1.0-20050306/configure.patch delete mode 100644 recipes/dialog/dialog-1.0-20050306/m4.patch delete mode 100644 recipes/dialog/dialog-1.0-20050306/templates.patch delete mode 100644 recipes/dialog/dialog-static_1.0-20050306.bb create mode 100644 recipes/dialog/dialog-static_1.1-20080819.bb create mode 100644 recipes/dialog/dialog_1.1-20080819.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index a5746bcdec..6321357738 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -4614,9 +4614,9 @@ sha256=902da1b1e9d90dfda8aa1864846db8ad12386e7521fc9f8b18c8ba220dd0123a md5=7b81b22baa2df55efe4845865dddc7b6 sha256=7bb43d8b0cb287d728ea479fb65d1b57b8530af773018214e7f312dceed34237 -[ftp://ftp.us.debian.org/debian/pool/main/d/dialog/dialog_1.0-20050306.orig.tar.gz] -md5=8ce5945be0660bd3152bd9eb0827f945 -sha256=e3968765ed916b348fce5e309029d25d068a61e1d422a69a506d0fc80ee6e976 +[ftp://invisible-island.net/dialog/dialog-1.1-20080819.tgz] +md5=3caebd641a9f337b980becb4444336c5 +sha256=c5d49b39c5998bcecd124c05cc6f096d22ccdc378ad455214611ae41a2f4b7d9 [http://didiwiki.org/sources/didiwiki-0.2.tar.gz] md5=a8643526ced64ed066df407e013259e3 diff --git a/recipes/dialog/dialog-1.0-20050306/configure.patch b/recipes/dialog/dialog-1.0-20050306/configure.patch deleted file mode 100644 index 754243ad45..0000000000 --- a/recipes/dialog/dialog-1.0-20050306/configure.patch +++ /dev/null @@ -1,37 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- dialog-0.9b-20031207/configure.in~configure -+++ dialog-0.9b-20031207/configure.in -@@ -6,6 +6,8 @@ - AC_CONFIG_HEADER(dlg_config.h:config.hin) - - CF_VERSION_INFO(dialog) -+AH_TEMPLATE([DIALOG_VERSION], [Define to dialog version]) -+AH_TEMPLATE([DIALOG_PATCHDATE], [Define to dialog patchdate]) - - DESTDIR= - AC_SUBST(DESTDIR) -@@ -146,6 +148,20 @@ - wget_wch \ - ) - -+AH_TEMPLATE([HAVE_COLOR], -+ [Define if you have the start_color function]) -+AH_TEMPLATE([HAVE_FORMBOX], -+ [Define if you want the form dialog]) -+AH_TEMPLATE([HAVE_GAUGE], -+ [Define if you want the gauge dialog]) -+AH_TEMPLATE([HAVE_TAILBOX], -+ [Define if you want the tailbox dialog]) -+AH_TEMPLATE([HAVE_XDIALOG], -+ [Define if you want Xdialog-style dialogs]) -+AH_TEMPLATE([HAVE_RC_FILE], -+ [Define if you want the config-file support]) -+AH_TEMPLATE([USE_WIDE_CURSES], [Define if using wide curses]) -+ - AC_CHECK_FUNC(start_color,[AC_DEFINE(HAVE_COLOR)]) - CF_CURSES_CHTYPE - CF_FUNC_WAIT diff --git a/recipes/dialog/dialog-1.0-20050306/m4.patch b/recipes/dialog/dialog-1.0-20050306/m4.patch deleted file mode 100644 index d7701b1770..0000000000 --- a/recipes/dialog/dialog-1.0-20050306/m4.patch +++ /dev/null @@ -1,6979 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: dialog-1.0-20050306/acinclude.m4 -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ dialog-1.0-20050306/acinclude.m4 2005-05-16 01:32:07.000000000 +0200 -@@ -0,0 +1,1953 @@ -+dnl --------------------------------------------------------------------------- -+dnl CF_AC_PREREQ version: 2 updated: 1997/09/06 13:24:56 -+dnl ------------ -+dnl Conditionally generate script according to whether we're using the release -+dnl version of autoconf, or a patched version (using the ternary component as -+dnl the patch-version). -+define(CF_AC_PREREQ, -+[CF_PREREQ_COMPARE( -+AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), -+AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), [$1], [$2], [$3])])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_ADD_INCDIR version: 4 updated: 2002/12/21 14:25:52 -+dnl ------------- -+dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's -+dnl redundant. We don't normally need to add -I/usr/local/include for gcc, -+dnl but old versions (and some misinstalled ones) need that. To make things -+dnl worse, gcc 3.x gives error messages if -I/usr/local/include is added to -+dnl the include-path). -+AC_DEFUN([CF_ADD_INCDIR], -+[ -+for cf_add_incdir in $1 -+do -+ while true -+ do -+ case $cf_add_incdir in -+ /usr/include) # (vi -+ ;; -+ /usr/local/include) # (vi -+ if test "$GCC" = yes -+ then -+ cf_save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" -+ AC_TRY_COMPILE([#include ], -+ [printf("Hello")], -+ [], -+ [CPPFLAGS="$cf_save_CPPFLAGS"]) -+ fi -+ ;; -+ *) # (vi -+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" -+ ;; -+ esac -+ cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` -+ test "$cf_top_incdir" = "$cf_add_incdir" && break -+ cf_add_incdir="$cf_top_incdir" -+ done -+done -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31 -+dnl -------------- -+dnl Allow user to disable a normally-on option. -+AC_DEFUN([CF_ARG_DISABLE], -+[CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31 -+dnl ------------- -+dnl Allow user to enable a normally-off option. -+AC_DEFUN([CF_ARG_ENABLE], -+[CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_ARG_MSG_ENABLE version: 2 updated: 2000/07/29 19:32:03 -+dnl ----------------- -+dnl Verbose form of AC_ARG_ENABLE: -+dnl -+dnl Parameters: -+dnl $1 = message -+dnl $2 = option name -+dnl $3 = help-string -+dnl $4 = action to perform if option is enabled -+dnl $5 = action if perform if option is disabled -+dnl $6 = default option value (either 'yes' or 'no') -+AC_DEFUN([CF_ARG_MSG_ENABLE],[ -+AC_MSG_CHECKING($1) -+AC_ARG_ENABLE($2,[$3],,enableval=ifelse($6,,no,$6)) -+AC_MSG_RESULT($enableval) -+if test "$enableval" != no ; then -+ifelse($4,,[ :],$4) -+else -+ifelse($5,,[ :],$5) -+fi -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_ARG_OPTION version: 3 updated: 1997/10/18 14:42:41 -+dnl ------------- -+dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus -+dnl values. -+dnl -+dnl Parameters: -+dnl $1 = option name -+dnl $2 = help-string -+dnl $3 = action to perform if option is not default -+dnl $4 = action if perform if option is default -+dnl $5 = default option value (either 'yes' or 'no') -+AC_DEFUN([CF_ARG_OPTION], -+[AC_ARG_ENABLE($1,[$2],[test "$enableval" != ifelse($5,no,yes,no) && enableval=ifelse($5,no,no,yes) -+ if test "$enableval" != "$5" ; then -+ifelse($3,,[ :]dnl -+,[ $3]) ifelse($4,,,[ -+ else -+ $4]) -+ fi],[enableval=$5 ifelse($4,,,[ -+ $4 -+])dnl -+ ])])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_BUNDLED_INTL version: 10 updated: 2003/09/14 18:49:13 -+dnl --------------- -+dnl Top-level macro for configuring an application with a bundled copy of -+dnl the intl and po directories for gettext. -+dnl -+dnl $1 specifies either Makefile or makefile, defaulting to the former. -+dnl $2 if nonempty sets the option to --enable-nls rather than to --disable-nls -+dnl -+dnl Sets variables which can be used to substitute in makefiles: -+dnl INTLDIR_MAKE - to make ./intl directory -+dnl MSG_DIR_MAKE - to make ./po directory -+dnl SUB_MAKEFILE - list of makefiles in ./intl, ./po directories -+dnl Defines -+dnl HAVE_LIBGETTEXT_H if we're using ./intl -+dnl -+dnl Environment: -+dnl ALL_LINGUAS if set, lists the root names of the ".po" files. -+dnl CONFIG_H assumed to be "config.h" -+dnl VERSION may be set, otherwise extract from "VERSION" file. -+dnl -+AH_TEMPLATE([HAVE_LIBGETTEXT_H], [Define if we're using ./intl.]) -+AC_DEFUN([CF_BUNDLED_INTL],[ -+cf_makefile=ifelse($1,,Makefile,$1) -+ -+dnl Set of available languages (based on source distribution). Note that -+dnl setting $LINGUAS overrides $ALL_LINGUAS. Some environments set $LINGUAS -+dnl rather than $LC_ALL -+test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'` -+ -+# Allow override of "config.h" definition: -+: ${CONFIG_H=config.h} -+AC_SUBST(CONFIG_H) -+ -+if test -z "$VERSION" ; then -+if test -f $srcdir/VERSION ; then -+ VERSION=`sed -e '2,$d' $srcdir/VERSION|cut -f1` -+else -+ VERSION=unknown -+fi -+fi -+AC_SUBST(VERSION) -+ -+AM_GNU_GETTEXT(,,,[$2]) -+ -+INTLDIR_MAKE= -+MSG_DIR_MAKE= -+SUB_MAKEFILE= -+ -+dnl this updates SUB_MAKEFILE and MSG_DIR_MAKE: -+CF_OUR_MESSAGES($1) -+ -+if test "$USE_INCLUDED_LIBINTL" = yes ; then -+ if test "$nls_cv_force_use_gnu_gettext" = yes ; then -+ : -+ elif test "$nls_cv_use_gnu_gettext" = yes ; then -+ : -+ else -+ INTLDIR_MAKE="#" -+ fi -+ if test -z "$INTLDIR_MAKE"; then -+ AC_DEFINE(HAVE_LIBGETTEXT_H) -+ for cf_makefile in \ -+ $srcdir/intl/Makefile.in \ -+ $srcdir/intl/makefile.in -+ do -+ if test -f "$cf_makefile" ; then -+ SUB_MAKEFILE="$SUB_MAKEFILE `echo ${cf_makefile}|sed -e 's/\.in$//'`:${cf_makefile}" -+ break -+ fi -+ done -+ fi -+else -+ INTLDIR_MAKE="#" -+ if test "$USE_NLS" = yes ; then -+ AC_CHECK_HEADERS(libintl.h) -+ fi -+fi -+ -+if test -z "$INTLDIR_MAKE" ; then -+ CPPFLAGS="-I../intl $CPPFLAGS" -+fi -+ -+dnl FIXME: we use this in lynx (the alternative is a spurious dependency upon -+dnl GNU make) -+if test "$BUILD_INCLUDED_LIBINTL" = yes ; then -+ GT_YES="#" -+ GT_NO= -+else -+ GT_YES= -+ GT_NO="#" -+fi -+ -+AC_SUBST(INTLDIR_MAKE) -+AC_SUBST(MSG_DIR_MAKE) -+AC_SUBST(GT_YES) -+AC_SUBST(GT_NO) -+ -+dnl FIXME: the underlying AM_GNU_GETTEXT macro either needs some fixes or a -+dnl little documentation. It doesn't define anything so that we can ifdef our -+dnl own code, except ENABLE_NLS, which is too vague to be of any use. -+ -+if test "$USE_INCLUDED_LIBINTL" = yes ; then -+ if test "$nls_cv_force_use_gnu_gettext" = yes ; then -+ AC_DEFINE(HAVE_GETTEXT) -+ elif test "$nls_cv_use_gnu_gettext" = yes ; then -+ AC_DEFINE(HAVE_GETTEXT) -+ fi -+ if test -n "$nls_cv_header_intl" ; then -+ AC_DEFINE(HAVE_LIBINTL_H) -+ fi -+fi -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_CHECK_CACHE version: 7 updated: 2001/12/19 00:50:10 -+dnl -------------- -+dnl Check if we're accidentally using a cache from a different machine. -+dnl Derive the system name, as a check for reusing the autoconf cache. -+dnl -+dnl If we've packaged config.guess and config.sub, run that (since it does a -+dnl better job than uname). Normally we'll use AC_CANONICAL_HOST, but allow -+dnl an extra parameter that we may override, e.g., for AC_CANONICAL_SYSTEM -+dnl which is useful in cross-compiles. -+AC_DEFUN([CF_CHECK_CACHE], -+[ -+if test -f $srcdir/config.guess ; then -+ ifelse([$1],,[AC_CANONICAL_HOST],[$1]) -+ system_name="$host_os" -+else -+ system_name="`(uname -s -r) 2>/dev/null`" -+ if test -z "$system_name" ; then -+ system_name="`(hostname) 2>/dev/null`" -+ fi -+fi -+AH_TEMPLATE([SYSTEM_NAME], [Set to the system name]) -+test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name") -+AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"]) -+ -+test -z "$system_name" && system_name="$cf_cv_system_name" -+test -n "$cf_cv_system_name" && AC_MSG_RESULT(Configuring for $cf_cv_system_name) -+ -+if test ".$system_name" != ".$cf_cv_system_name" ; then -+ AC_MSG_RESULT(Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)) -+ AC_ERROR("Please remove config.cache and try again.") -+fi -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_CURSES_CHTYPE version: 6 updated: 2003/11/06 19:59:57 -+dnl ---------------- -+dnl Test if curses defines 'chtype' (usually a 'long' type for SysV curses). -+AH_TEMPLATE([HAVE_TYPE_CHTYPE], [Define if curses defines 'chtype'.]) -+AH_TEMPLATE([TYPE_CHTYPE_IS_SCALAR], [Define if chtype is scalar rather than a struct.]) -+AC_DEFUN([CF_CURSES_CHTYPE], -+[ -+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl -+AC_CACHE_CHECK(for chtype typedef,cf_cv_chtype_decl,[ -+ AC_TRY_COMPILE([#include <${cf_cv_ncurses_header-curses.h}>], -+ [chtype foo], -+ [cf_cv_chtype_decl=yes], -+ [cf_cv_chtype_decl=no])]) -+if test $cf_cv_chtype_decl = yes ; then -+ AC_DEFINE(HAVE_TYPE_CHTYPE) -+ AC_CACHE_CHECK(if chtype is scalar or struct,cf_cv_chtype_type,[ -+ AC_TRY_COMPILE([#include <${cf_cv_ncurses_header-curses.h}>], -+ [chtype foo; long x = foo], -+ [cf_cv_chtype_type=scalar], -+ [cf_cv_chtype_type=struct])]) -+ if test $cf_cv_chtype_type = scalar ; then -+ AC_DEFINE(TYPE_CHTYPE_IS_SCALAR) -+ fi -+fi -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_CURSES_CPPFLAGS version: 7 updated: 2003/06/06 00:48:41 -+dnl ------------------ -+dnl Look for the curses headers. -+AC_DEFUN([CF_CURSES_CPPFLAGS],[ -+ -+AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[ -+cf_cv_curses_incdir=no -+case $host_os in #(vi -+hpux10.*|hpux11.*) #(vi -+ test -d /usr/include/curses_colr && \ -+ cf_cv_curses_incdir="-I/usr/include/curses_colr" -+ ;; -+sunos3*|sunos4*) -+ test -d /usr/5lib && \ -+ test -d /usr/5include && \ -+ cf_cv_curses_incdir="-I/usr/5include" -+ ;; -+esac -+]) -+test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS" -+ -+AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[ -+cf_cv_ncurses_header=none -+for cf_header in \ -+ curses.h \ -+ ncurses.h \ -+ ncurses/curses.h \ -+ ncurses/ncurses.h -+do -+AC_TRY_COMPILE([#include <${cf_header}>], -+ [initscr(); tgoto("?", 0,0)], -+ [cf_cv_ncurses_header=$cf_header; break],[]) -+done -+]) -+ -+if test "$cf_cv_ncurses_header" = none ; then -+ AC_MSG_ERROR(No curses header-files found) -+fi -+ -+# cheat, to get the right #define's for HAVE_NCURSES_H, etc. -+AC_CHECK_HEADERS($cf_cv_ncurses_header) -+ -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_CURSES_FUNCS version: 12 updated: 2003/11/06 19:59:57 -+dnl --------------- -+dnl Curses-functions are a little complicated, since a lot of them are macros. -+AC_DEFUN([CF_CURSES_FUNCS], -+[ -+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl -+AC_REQUIRE([CF_XOPEN_CURSES]) -+AC_REQUIRE([CF_CURSES_TERM_H]) -+for cf_func in $1 -+do -+ CF_UPPER(cf_tr_func,$cf_func) -+ AC_MSG_CHECKING(for ${cf_func}) -+ CF_MSG_LOG(${cf_func}) -+ AC_CACHE_VAL(cf_cv_func_$cf_func,[ -+ eval cf_result='$ac_cv_func_'$cf_func -+ if test ".$cf_result" != ".no"; then -+ AC_TRY_LINK([ -+#ifdef HAVE_XCURSES -+#include -+char * XCursesProgramName = "test"; -+#else -+#include <${cf_cv_ncurses_header-curses.h}> -+#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) -+#include -+#else -+#if defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) -+#include -+#else -+#ifdef HAVE_TERM_H -+#include -+#endif -+#endif -+#endif -+#endif], -+ [ -+#ifndef ${cf_func} -+long foo = (long)(&${cf_func}); -+exit(foo == 0); -+#endif -+ ], -+ [cf_result=yes], -+ [cf_result=no]) -+ fi -+ eval 'cf_cv_func_'$cf_func'=$cf_result' -+ ]) -+ # use the computed/retrieved cache-value: -+ eval 'cf_result=$cf_cv_func_'$cf_func -+ AC_MSG_RESULT($cf_result) -+ if test $cf_result != no; then -+ AC_DEFINE_UNQUOTED(HAVE_${cf_tr_func}) -+ fi -+done -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_CURSES_LIBS version: 23 updated: 2003/11/06 19:59:57 -+dnl -------------- -+dnl Look for the curses libraries. Older curses implementations may require -+dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. -+AC_DEFUN([CF_CURSES_LIBS],[ -+ -+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl -+AC_MSG_CHECKING(if we have identified curses libraries) -+AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], -+ [initscr(); tgoto("?", 0,0)], -+ cf_result=yes, -+ cf_result=no) -+AC_MSG_RESULT($cf_result) -+ -+if test "$cf_result" = no ; then -+case $host_os in #(vi -+freebsd*) #(vi -+ AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"]) -+ ;; -+hpux10.*|hpux11.*) #(vi -+ AC_CHECK_LIB(cur_colr,initscr,[ -+ LIBS="-lcur_colr $LIBS" -+ ac_cv_func_initscr=yes -+ ],[ -+ AC_CHECK_LIB(Hcurses,initscr,[ -+ # HP's header uses __HP_CURSES, but user claims _HP_CURSES. -+ LIBS="-lHcurses $LIBS" -+ CPPFLAGS="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS" -+ ac_cv_func_initscr=yes -+ ])]) -+ ;; -+linux*) # Suse Linux does not follow /usr/lib convention -+ LIBS="$LIBS -L/lib" -+ ;; -+sunos3*|sunos4*) -+ test -d /usr/5lib && \ -+ LIBS="$LIBS -L/usr/5lib -lcurses -ltermcap" -+ ac_cv_func_initscr=yes -+ ;; -+esac -+ -+if test ".$ac_cv_func_initscr" != .yes ; then -+ cf_save_LIBS="$LIBS" -+ cf_term_lib="" -+ cf_curs_lib="" -+ -+ if test ".${cf_cv_ncurses_version-no}" != .no -+ then -+ cf_check_list="ncurses curses cursesX" -+ else -+ cf_check_list="cursesX curses ncurses" -+ fi -+ -+ # Check for library containing tgoto. Do this before curses library -+ # because it may be needed to link the test-case for initscr. -+ AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ -+ for cf_term_lib in $cf_check_list termcap termlib unknown -+ do -+ AC_CHECK_LIB($cf_term_lib,tgoto,[break]) -+ done -+ ]) -+ -+ # Check for library containing initscr -+ test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" -+ for cf_curs_lib in $cf_check_list xcurses jcurses unknown -+ do -+ AC_CHECK_LIB($cf_curs_lib,initscr,[break]) -+ done -+ test $cf_curs_lib = unknown && AC_ERROR(no curses library found) -+ -+ LIBS="-l$cf_curs_lib $cf_save_LIBS" -+ if test "$cf_term_lib" = unknown ; then -+ AC_MSG_CHECKING(if we can link with $cf_curs_lib library) -+ AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], -+ [initscr()], -+ [cf_result=yes], -+ [cf_result=no]) -+ AC_MSG_RESULT($cf_result) -+ test $cf_result = no && AC_ERROR(Cannot link curses library) -+ elif test "$cf_curs_lib" = "$cf_term_lib" ; then -+ : -+ elif test "$cf_term_lib" != predefined ; then -+ AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) -+ AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], -+ [initscr(); tgoto((char *)0, 0, 0);], -+ [cf_result=no], -+ [ -+ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" -+ AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], -+ [initscr()], -+ [cf_result=yes], -+ [cf_result=error]) -+ ]) -+ AC_MSG_RESULT($cf_result) -+ fi -+fi -+fi -+ -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_CURSES_TERM_H version: 6 updated: 2003/11/06 19:59:57 -+dnl ---------------- -+dnl SVr4 curses should have term.h as well (where it puts the definitions of -+dnl the low-level interface). This may not be true in old/broken implementations, -+dnl as well as in misconfigured systems (e.g., gcc configured for Solaris 2.4 -+dnl running with Solaris 2.5.1). -+AC_DEFUN([CF_CURSES_TERM_H], -+[ -+AC_CACHE_CHECK(for term.h, cf_cv_term_header,[ -+ -+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl -+# If we found , look for , but always look -+# for if we do not find the variant. -+for cf_header in \ -+ `echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \ -+ term.h -+do -+ AC_TRY_COMPILE([ -+#include <${cf_cv_ncurses_header-curses.h}> -+#include <${cf_header}>], -+ [WINDOW *x], -+ [cf_cv_term_header=$cf_header -+ break], -+ [cf_cv_term_header=no]) -+done -+]) -+ -+AH_TEMPLATE([HAVE_TERM_H], [define if you have term.h]) -+AH_TEMPLATE([HAVE_NCURSES_TERM_H], [define if you have ncurses/term.h]) -+AH_TEMPLATE([HAVE_NCURSESW_TERM_H], [define if you have ncursesw/term.h]) -+case $cf_cv_term_header in #(vi -+term.h) #(vi -+ AC_DEFINE(HAVE_TERM_H) -+ ;; -+ncurses/term.h) -+ AC_DEFINE(HAVE_NCURSES_TERM_H) -+ ;; -+ncursesw/term.h) -+ AC_DEFINE(HAVE_NCURSESW_TERM_H) -+ ;; -+esac -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52 -+dnl ---------- -+dnl "dirname" is not portable, so we fake it with a shell script. -+AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_DISABLE_ECHO version: 10 updated: 2003/04/17 22:27:11 -+dnl --------------- -+dnl You can always use "make -n" to see the actual options, but it's hard to -+dnl pick out/analyze warning messages when the compile-line is long. -+dnl -+dnl Sets: -+dnl ECHO_LT - symbol to control if libtool is verbose -+dnl ECHO_LD - symbol to prefix "cc -o" lines -+dnl RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o) -+dnl SHOW_CC - symbol to put before explicit "cc -c" lines -+dnl ECHO_CC - symbol to put before any "cc" line -+dnl -+AC_DEFUN([CF_DISABLE_ECHO],[ -+AC_MSG_CHECKING(if you want to see long compiling messages) -+CF_ARG_DISABLE(echo, -+ [ --disable-echo display "compiling" commands], -+ [ -+ ECHO_LT='--silent' -+ ECHO_LD='@echo linking [$]@;' -+ RULE_CC=' @echo compiling [$]<' -+ SHOW_CC=' @echo compiling [$]@' -+ ECHO_CC='@' -+],[ -+ ECHO_LT='' -+ ECHO_LD='' -+ RULE_CC='# compiling' -+ SHOW_CC='# compiling' -+ ECHO_CC='' -+]) -+AC_MSG_RESULT($enableval) -+AC_SUBST(ECHO_LT) -+AC_SUBST(ECHO_LD) -+AC_SUBST(RULE_CC) -+AC_SUBST(SHOW_CC) -+AC_SUBST(ECHO_CC) -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_FIND_LIBRARY version: 7 updated: 2000/04/13 21:38:04 -+dnl --------------- -+dnl Look for a non-standard library, given parameters for AC_TRY_LINK. We -+dnl prefer a standard location, and use -L options only if we do not find the -+dnl library in the standard library location(s). -+dnl $1 = library name -+dnl $2 = library class, usually the same as library name -+dnl $3 = includes -+dnl $4 = code fragment to compile/link -+dnl $5 = corresponding function-name -+dnl $6 = flag, nonnull if failure causes an error-exit -+dnl -+dnl Sets the variable "$cf_libdir" as a side-effect, so we can see if we had -+dnl to use a -L option. -+AC_DEFUN([CF_FIND_LIBRARY], -+[ -+ eval 'cf_cv_have_lib_'$1'=no' -+ cf_libdir="" -+ AC_CHECK_FUNC($5, -+ eval 'cf_cv_have_lib_'$1'=yes',[ -+ cf_save_LIBS="$LIBS" -+ AC_MSG_CHECKING(for $5 in -l$1) -+ LIBS="-l$1 $LIBS" -+ AC_TRY_LINK([$3],[$4], -+ [AC_MSG_RESULT(yes) -+ eval 'cf_cv_have_lib_'$1'=yes' -+ ], -+ [AC_MSG_RESULT(no) -+ CF_LIBRARY_PATH(cf_search,$2) -+ for cf_libdir in $cf_search -+ do -+ AC_MSG_CHECKING(for -l$1 in $cf_libdir) -+ LIBS="-L$cf_libdir -l$1 $cf_save_LIBS" -+ AC_TRY_LINK([$3],[$4], -+ [AC_MSG_RESULT(yes) -+ eval 'cf_cv_have_lib_'$1'=yes' -+ break], -+ [AC_MSG_RESULT(no) -+ LIBS="$cf_save_LIBS"]) -+ done -+ ]) -+ ]) -+eval 'cf_found_library=[$]cf_cv_have_lib_'$1 -+ifelse($6,,[ -+if test $cf_found_library = no ; then -+ AC_ERROR(Cannot link $1 library) -+fi -+]) -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_FUNC_WAIT version: 2 updated: 1997/10/21 19:45:33 -+dnl ------------ -+dnl Test for the presence of , 'union wait', arg-type of 'wait()' -+dnl and/or 'waitpid()'. -+dnl -+dnl Note that we cannot simply grep for 'union wait' in the wait.h file, -+dnl because some Posix systems turn this on only when a BSD variable is -+dnl defined. -+dnl -+dnl I don't use AC_HEADER_SYS_WAIT, because it defines HAVE_SYS_WAIT_H, which -+dnl would conflict with an attempt to test that header directly. -+dnl -+AH_TEMPLATE([WAIT_USES_UNION], [Define if wait uses union]) -+AH_TEMPLATE([WAITPID_USES_UNION], [Define if waitpid uses union]) -+AC_DEFUN([CF_FUNC_WAIT], -+[ -+AC_REQUIRE([CF_UNION_WAIT]) -+if test $cf_cv_type_unionwait = yes; then -+ -+ AC_MSG_CHECKING(if union wait can be used as wait-arg) -+ AC_CACHE_VAL(cf_cv_arg_union_wait,[ -+ AC_TRY_COMPILE($cf_wait_headers, -+ [union wait x; wait(&x)], -+ [cf_cv_arg_union_wait=yes], -+ [cf_cv_arg_union_wait=no]) -+ ]) -+ AC_MSG_RESULT($cf_cv_arg_union_wait) -+ test $cf_cv_arg_union_wait = yes && AC_DEFINE(WAIT_USES_UNION) -+ -+ AC_MSG_CHECKING(if union wait can be used as waitpid-arg) -+ AC_CACHE_VAL(cf_cv_arg_union_waitpid,[ -+ AC_TRY_COMPILE($cf_wait_headers, -+ [union wait x; waitpid(0, &x, 0)], -+ [cf_cv_arg_union_waitpid=yes], -+ [cf_cv_arg_union_waitpid=no]) -+ ]) -+ AC_MSG_RESULT($cf_cv_arg_union_waitpid) -+ test $cf_cv_arg_union_waitpid = yes && AC_DEFINE(WAITPID_USES_UNION) -+ -+fi -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_GCC_ATTRIBUTES version: 9 updated: 2002/12/21 19:25:52 -+dnl ----------------- -+dnl Test for availability of useful gcc __attribute__ directives to quiet -+dnl compiler warnings. Though useful, not all are supported -- and contrary -+dnl to documentation, unrecognized directives cause older compilers to barf. -+AC_DEFUN([CF_GCC_ATTRIBUTES], -+[ -+if test "$GCC" = yes -+then -+cat > conftest.i < conftest.$ac_ext <&AC_FD_CC -+ case $cf_attribute in -+ scanf|printf) -+ cat >conftest.h <conftest.h <>confdefs.h -+ fi -+ done -+else -+ fgrep define conftest.i >>confdefs.h -+fi -+rm -rf conftest* -+fi -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_GCC_VERSION version: 3 updated: 2003/09/06 19:16:57 -+dnl -------------- -+dnl Find version of gcc -+AC_DEFUN([CF_GCC_VERSION],[ -+AC_REQUIRE([AC_PROG_CC]) -+GCC_VERSION=none -+if test "$GCC" = yes ; then -+ AC_MSG_CHECKING(version of $CC) -+ GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" -+ test -z "$GCC_VERSION" && GCC_VERSION=unknown -+ AC_MSG_RESULT($GCC_VERSION) -+fi -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_GCC_WARNINGS version: 15 updated: 2003/07/05 18:42:30 -+dnl --------------- -+dnl Check if the compiler supports useful warning options. There's a few that -+dnl we don't use, simply because they're too noisy: -+dnl -+dnl -Wconversion (useful in older versions of gcc, but not in gcc 2.7.x) -+dnl -Wredundant-decls (system headers make this too noisy) -+dnl -Wtraditional (combines too many unrelated messages, only a few useful) -+dnl -Wwrite-strings (too noisy, but should review occasionally). This -+dnl is enabled for ncurses using "--enable-const". -+dnl -pedantic -+dnl -+AC_DEFUN([CF_GCC_WARNINGS], -+[ -+AC_REQUIRE([CF_GCC_VERSION]) -+if test "$GCC" = yes -+then -+ cat > conftest.$ac_ext <],[ -+#ifndef _XOPEN_SOURCE -+make an error -+#endif], -+ [cf_cv_gnu_source=no], -+ [cf_save="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" -+ AC_TRY_COMPILE([#include ],[ -+#ifdef _XOPEN_SOURCE -+make an error -+#endif], -+ [cf_cv_gnu_source=no], -+ [cf_cv_gnu_source=yes]) -+ CPPFLAGS="$cf_save" -+ ]) -+]) -+test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59 -+dnl -------------- -+dnl Construct a search-list for a nonstandard header-file -+AC_DEFUN([CF_HEADER_PATH], -+[CF_SUBDIR_PATH($1,$2,include) -+test "$includedir" != NONE && \ -+test "$includedir" != "/usr/include" && \ -+test -d "$includedir" && { -+ test -d $includedir && $1="[$]$1 $includedir" -+ test -d $includedir/$2 && $1="[$]$1 $includedir/$2" -+} -+ -+test "$oldincludedir" != NONE && \ -+test "$oldincludedir" != "/usr/include" && \ -+test -d "$oldincludedir" && { -+ test -d $oldincludedir && $1="[$]$1 $oldincludedir" -+ test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2" -+} -+ -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23 -+dnl --------------- -+dnl Insert text into the help-message, for readability, from AC_ARG_WITH. -+AC_DEFUN([CF_HELP_MESSAGE], -+[AC_DIVERT_HELP([$1])dnl -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_INCLUDE_DIRS version: 4 updated: 2002/12/01 00:12:15 -+dnl --------------- -+dnl Construct the list of include-options according to whether we're building -+dnl in the source directory or using '--srcdir=DIR' option. If we're building -+dnl with gcc, don't append the includedir if it happens to be /usr/include, -+dnl since that usually breaks gcc's shadow-includes. -+AC_DEFUN([CF_INCLUDE_DIRS], -+[ -+CPPFLAGS="-I. -I../include $CPPFLAGS" -+if test "$srcdir" != "."; then -+ CPPFLAGS="-I\$(srcdir)/../include $CPPFLAGS" -+fi -+if test "$GCC" != yes; then -+ CPPFLAGS="$CPPFLAGS -I\$(includedir)" -+elif test "$includedir" != "/usr/include"; then -+ if test "$includedir" = '${prefix}/include' ; then -+ if test $prefix != /usr ; then -+ CPPFLAGS="$CPPFLAGS -I\$(includedir)" -+ fi -+ else -+ CPPFLAGS="$CPPFLAGS -I\$(includedir)" -+ fi -+fi -+AC_SUBST(CPPFLAGS) -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_INCLUDE_PATH version: 4 updated: 2001/04/15 21:21:45 -+dnl --------------- -+dnl Adds to the include-path -+dnl -+dnl Autoconf 1.11 should have provided a way to add include path options to -+dnl the cpp-tests. -+dnl -+AC_DEFUN([CF_INCLUDE_PATH], -+[ -+for cf_path in $1 -+do -+ cf_result="no" -+ AC_MSG_CHECKING(for directory $cf_path) -+ if test -d $cf_path -+ then -+ INCLUDES="$INCLUDES -I$cf_path" -+ ac_cpp="${ac_cpp} -I$cf_path" -+ CFLAGS="$CFLAGS -I$cf_path" -+ cf_result="yes" -+ case $cf_path in -+ /usr/include|/usr/include/*) -+ ;; -+ *) -+ CF_DIRNAME(cf_temp,$cf_path) -+ case $cf_temp in -+ */include) -+ INCLUDES="$INCLUDES -I$cf_temp" -+ ac_cpp="${ac_cpp} -I$cf_temp" -+ CFLAGS="$CFLAGS -I$cf_temp" -+ ;; -+ esac -+ esac -+ fi -+ AC_MSG_RESULT($cf_result) -+done -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_LIBRARY_PATH version: 7 updated: 2002/11/10 14:46:59 -+dnl --------------- -+dnl Construct a search-list for a nonstandard library-file -+AC_DEFUN([CF_LIBRARY_PATH], -+[CF_SUBDIR_PATH($1,$2,lib)])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_LIB_PREFIX version: 7 updated: 2001/01/12 01:23:48 -+dnl ------------- -+dnl Compute the library-prefix for the given host system -+dnl $1 = variable to set -+AC_DEFUN([CF_LIB_PREFIX], -+[ -+ case $cf_cv_system_name in -+ OS/2*) LIB_PREFIX='' ;; -+ os2*) LIB_PREFIX='' ;; -+ *) LIB_PREFIX='lib' ;; -+ esac -+ifelse($1,,,[$1=$LIB_PREFIX]) -+ AC_SUBST(LIB_PREFIX) -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_MAKEFLAGS version: 9 updated: 2001/12/30 18:17:27 -+dnl ------------ -+dnl Some 'make' programs support $(MAKEFLAGS), some $(MFLAGS), to pass 'make' -+dnl options to lower-levels. It's very useful for "make -n" -- if we have it. -+dnl (GNU 'make' does both, something POSIX 'make', which happens to make the -+dnl $(MAKEFLAGS) variable incompatible because it adds the assignments :-) -+AC_DEFUN([CF_MAKEFLAGS], -+[ -+AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[ -+ cf_cv_makeflags='' -+ for cf_option in '-$(MAKEFLAGS)' '$(MFLAGS)' -+ do -+ cat >cf_makeflags.tmp </dev/null` -+ case "$cf_result" in -+ .*k) -+ cf_result=`${MAKE-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` -+ case "$cf_result" in -+ .*CC=*) cf_cv_makeflags= -+ ;; -+ *) cf_cv_makeflags=$cf_option -+ ;; -+ esac -+ break -+ ;; -+ *) echo no match "$cf_result" -+ ;; -+ esac -+ done -+ rm -f cf_makeflags.tmp -+]) -+ -+AC_SUBST(cf_cv_makeflags) -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_MAKE_TAGS version: 2 updated: 2000/10/04 09:18:40 -+dnl ------------ -+dnl Generate tags/TAGS targets for makefiles. Do not generate TAGS if we have -+dnl a monocase filesystem. -+AC_DEFUN([CF_MAKE_TAGS],[ -+AC_REQUIRE([CF_MIXEDCASE_FILENAMES]) -+AC_CHECK_PROG(MAKE_LOWER_TAGS, ctags, yes, no) -+ -+if test "$cf_cv_mixedcase" = yes ; then -+ AC_CHECK_PROG(MAKE_UPPER_TAGS, etags, yes, no) -+else -+ MAKE_UPPER_TAGS=no -+fi -+ -+if test "$MAKE_UPPER_TAGS" = yes ; then -+ MAKE_UPPER_TAGS= -+else -+ MAKE_UPPER_TAGS="#" -+fi -+AC_SUBST(MAKE_UPPER_TAGS) -+ -+if test "$MAKE_LOWER_TAGS" = yes ; then -+ MAKE_LOWER_TAGS= -+else -+ MAKE_LOWER_TAGS="#" -+fi -+AC_SUBST(MAKE_LOWER_TAGS) -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_MATH_LIB version: 5 updated: 2000/05/28 01:39:10 -+dnl ----------- -+dnl Checks for libraries. At least one UNIX system, Apple Macintosh -+dnl Rhapsody 5.5, does not have -lm. We canno