From 936ee285488de4555dfdd31a4f6e770341b8337d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 9 Mar 2010 17:25:03 +0000 Subject: [PATCH 001/313] Updating utillinux-ng svn path=/nixpkgs/trunk/; revision=20508 --- pkgs/os-specific/linux/util-linux-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux-ng/default.nix index 3ab1c580837..166c9358759 100644 --- a/pkgs/os-specific/linux/util-linux-ng/default.nix +++ b/pkgs/os-specific/linux/util-linux-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses ? null, ... }: stdenv.mkDerivation rec { - name = "util-linux-ng-2.16.2"; + name = "util-linux-ng-2.17.1"; src = fetchurl { - url = "mirror://kernel/linux/utils/util-linux-ng/v2.16/${name}.tar.bz2"; - sha256 = "1sx3z64z8z95v93k0c9lczcp04zw4nm3d2rkhczkyxcpdfcgbhxi"; + url = "mirror://kernel/linux/utils/util-linux-ng/v2.17/${name}.tar.bz2"; + sha256 = "140k32jqg9192vskdb3p98q99qgr14029h975nw21p426zm1kh79"; }; configureFlags = '' From 804f4bed929ec097439a59c35af264070d1d3034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 9 Mar 2010 18:05:33 +0000 Subject: [PATCH 002/313] Fixing the evaluation of trunk (regarding reenabling uclibc cross builds) svn path=/nixpkgs/trunk/; revision=20509 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04f2d450f1b..c580fb6487d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3747,7 +3747,7 @@ let else if (name == "uclibc") then uclibcCross else throw "Unknown libc"; - libcCross = libcCrossChooser crossSystem.libc; + libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc; eglibc = import ../development/libraries/eglibc { inherit fetchsvn stdenv; From d2b237ba51821e376920a3959e06e285aad978fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 9 Mar 2010 18:14:59 +0000 Subject: [PATCH 003/313] Adding ired, a 'radare' simplification: Interactive Raw Editor. svn path=/nixpkgs/trunk/; revision=20511 --- .../tools/analysis/radare/ired.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/analysis/radare/ired.nix diff --git a/pkgs/development/tools/analysis/radare/ired.nix b/pkgs/development/tools/analysis/radare/ired.nix new file mode 100644 index 00000000000..f7fb810410d --- /dev/null +++ b/pkgs/development/tools/analysis/radare/ired.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "ired-0.4"; + + src = fetchurl { + url = "http://radare.org/get/${name}.tar.gz"; + sha256 = "0wya1ylc6adqg4qw5fi8aspc5d1yr27x9r2vpy133qxzia9qv3mm"; + }; + + installPhase = '' + make install PREFIX=$out + ''; + + meta = { + description = "Interactive Raw Editor"; + homepage = http://radare.org/; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c580fb6487d..c6333cc0e91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3067,6 +3067,10 @@ let inherit fetchurl stdenv lib; }; + ired = import ../development/tools/analysis/radare/ired.nix { + inherit fetchurl stdenv; + }; + jikespg = import ../development/tools/parsing/jikespg { inherit fetchurl stdenv; }; From fb6adb13ac8fde5033182d1d1a1744a665ef88b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 9 Mar 2010 22:17:38 +0000 Subject: [PATCH 004/313] Updating busybox. I left only a single busybox in its directory. The others, coming from the old cross-building nixpkgs implementation, were not referenced anywhere. This new busybox builds natively, and also cross-builds with uclibc. I updated the uclibc config with a busybox defconfig requirement (something about RPC). I made the gcc-cross-wrapper properly set the dynamic loader to programs. After this, 'qemu-arm' can run the dynamically linked busybox cross built for armv5tel--linux-gnueabi. svn path=/nixpkgs/trunk/; revision=20514 --- .../gcc-cross-wrapper/builder.sh | 4 +- pkgs/misc/busybox/busybox-1.1.nix | 16 - pkgs/misc/busybox/busybox-1.2.nix | 21 - pkgs/misc/busybox/busybox-1.3.nix | 16 - pkgs/misc/busybox/default.nix | 28 +- pkgs/misc/busybox/mips-config-1.1 | 581 ---------------- pkgs/misc/busybox/x86-config-1.2 | 635 ------------------ pkgs/os-specific/linux/uclibc/default.nix | 1 + 8 files changed, 30 insertions(+), 1272 deletions(-) delete mode 100644 pkgs/misc/busybox/busybox-1.1.nix delete mode 100644 pkgs/misc/busybox/busybox-1.2.nix delete mode 100644 pkgs/misc/busybox/busybox-1.3.nix delete mode 100644 pkgs/misc/busybox/mips-config-1.1 delete mode 100644 pkgs/misc/busybox/x86-config-1.2 diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh index aaf52cd7745..86d18ced54e 100644 --- a/pkgs/build-support/gcc-cross-wrapper/builder.sh +++ b/pkgs/build-support/gcc-cross-wrapper/builder.sh @@ -7,8 +7,8 @@ cflagsCompile="-B$out/bin/" if test -z "$nativeLibc"; then cflagsCompile="$cflagsCompile -B$libc/lib/ -isystem $libc/include" ldflags="$ldflags -L$libc/lib" - ldflagsBefore="-dynamic-linker $libc/lib/ld-linux.so.?" - #ldflagsBefore="-dynamic-linker $libc/lib/ld-uClibc.so.0" + dlinker=`eval 'echo $libc/lib/ld-*.so.?'` + ldflagsBefore="-dynamic-linker $dlinker" fi if test -n "$nativeTools"; then diff --git a/pkgs/misc/busybox/busybox-1.1.nix b/pkgs/misc/busybox/busybox-1.1.nix deleted file mode 100644 index e7fb996c45f..00000000000 --- a/pkgs/misc/busybox/busybox-1.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, gccCross, binutilsCross}: - -stdenv.mkDerivation { - name = "busybox-1.1.3"; - builder = ./builder.sh; - - src = fetchurl { - url = http://busybox.net/downloads/busybox-1.1.3.tar.bz2; - md5 = "19a0b475169335f17e421cf644616fe7"; - }; - - inherit gccCross; - buildinputs = [binutilsCross]; - config = ./mips-config-1.1; - -} diff --git a/pkgs/misc/busybox/busybox-1.2.nix b/pkgs/misc/busybox/busybox-1.2.nix deleted file mode 100644 index ce88e194d9f..00000000000 --- a/pkgs/misc/busybox/busybox-1.2.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, gccCross ? null, binutilsCross ? null}: - -stdenv.mkDerivation { - name = "busybox-1.2.2.1"; - - src = fetchurl { - url = http://busybox.net/downloads/busybox-1.2.2.1.tar.bz2; - md5 = "153f7a4d7580c19ed6f6570f039b64b5"; - }; - - # inherit gccCross; - - # buildinputs = [binutilsCross]; - - # fixme, need a decent config for MIPS or so - preBuild = '' - installFlags="PREFIX=$out" - cp ${./x86-config-1.2} .config - make include/bb_config.h - ''; -} diff --git a/pkgs/misc/busybox/busybox-1.3.nix b/pkgs/misc/busybox/busybox-1.3.nix deleted file mode 100644 index fe2ffb28b73..00000000000 --- a/pkgs/misc/busybox/busybox-1.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, gccCross ? null, binutilsCross ? null}: - -stdenv.mkDerivation { - name = "busybox-1.3.1"; - builder = ./builder.sh; - - src = fetchurl { - url = http://busybox.net/downloads/busybox-1.3.1.tar.bz2; - md5 = "571531cfa83726947ccb566de017ad4f"; - }; - - # inherit gccCross; - # buildinputs = [binutilsCross]; - # fixme, need a decent config for MIPS or so - config = ./x86-config-1.2; -} diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix index 054e0b0c577..61de814ad74 100644 --- a/pkgs/misc/busybox/default.nix +++ b/pkgs/misc/busybox/default.nix @@ -1 +1,27 @@ -import ./busybox-1.2.nix +{stdenv, fetchurl}: + +let + basicConfigure = '' + make defconfig + sed -i 's,.*CONFIG_PREFIX.*,CONFIG_PREFIX="'$out'",' .config + sed -i 's,.*CONFIG_INSTALL_NO_USR.*,CONFIG_INSTALL_NO_USR=y,' .config + ''; + +in + +stdenv.mkDerivation { + name = "busybox-1.16.0"; + + src = fetchurl { + url = http://busybox.net/downloads/busybox-1.16.0.tar.bz2; + sha256 = "1n738zk01yi2sjrx2y36hpzxbslas8b91vzykcifr0p1j7ym0lim"; + }; + + configurePhase = basicConfigure; + + crossAttrs = { + configurePhase = basicConfigure + '' + sed -i 's,.*CONFIG_CROSS_COMPILER_PREFIX.*,CONFIG_CROSS_COMPILER_PREFIX="'$crossConfig-'",' .config + ''; + }; +} diff --git a/pkgs/misc/busybox/mips-config-1.1 b/pkgs/misc/busybox/mips-config-1.1 deleted file mode 100644 index 5d98f33b73a..00000000000 --- a/pkgs/misc/busybox/mips-config-1.1 +++ /dev/null @@ -1,581 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# General Configuration -# -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_FEATURE_VERBOSE_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -# CONFIG_FEATURE_DEVFS is not set -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_SUID is not set -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set - -# -# Build Options -# -CONFIG_STATIC=y -# CONFIG_LFS is not set -USING_CROSS_COMPILER=y -CROSS_COMPILER_PREFIX="$(gccCross)/bin/mips-linux-" -EXTRA_CFLAGS_OPTIONS="" -CONFIG_FEATURE_SUSv2=y -CONFIG_FEATURE_SUSv2_OBSOLETE=y - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -PREFIX="./_install" - -# -# Archival Utilities -# -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -CONFIG_BUNZIP2=y -# CONFIG_CPIO is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set -CONFIG_GZIP=y -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y -# CONFIG_FEATURE_TAR_FROM is not set -CONFIG_FEATURE_TAR_GZIP=y -# CONFIG_FEATURE_TAR_COMPRESS is not set -CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_UNCOMPRESS is not set -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set -# CONFIG_FEATURE_DEB_TAR_GZ is not set -# CONFIG_FEATURE_DEB_TAR_BZ2 is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -CONFIG_CMP=y -# CONFIG_COMM is not set -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -CONFIG_DD=y -CONFIG_DF=y -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_EXPR=y -CONFIG_FALSE=y -# CONFIG_FOLD is not set -CONFIG_HEAD=y -# CONFIG_FEATURE_FANCY_HEAD is not set -# CONFIG_HOSTID is not set -CONFIG_ID=y -CONFIG_INSTALL=y -# CONFIG_LENGTH is not set -CONFIG_LN=y -# CONFIG_LOGNAME is not set -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -# CONFIG_MD5SUM is not set -CONFIG_MKDIR=y -# CONFIG_MKFIFO is not set -CONFIG_MKNOD=y -CONFIG_MV=y -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set -# CONFIG_OD is not set -# CONFIG_PRINTENV is not set -# CONFIG_PRINTF is not set -CONFIG_PWD=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -# CONFIG_SEQ is not set -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set -# CONFIG_SORT is not set -# CONFIG_FEATURE_SORT_BIG is not set -# CONFIG_STAT is not set -# CONFIG_FEATURE_STAT_FORMAT is not set -# CONFIG_STTY is not set -# CONFIG_SUM is not set -CONFIG_SYNC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TEST=y - -# -# test (forced enabled for use with shell) -# -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -CONFIG_TR=y -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNIQ=y -CONFIG_USLEEP=y -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -# CONFIG_WATCH is not set -CONFIG_WC=y -# CONFIG_WHO is not set -CONFIG_WHOAMI=y -CONFIG_YES=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for ls and more -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -# CONFIG_DUMPKMAP is not set -# CONFIG_LOADFONT is not set -# CONFIG_LOADKMAP is not set -CONFIG_OPENVT=y -CONFIG_RESET=y -# CONFIG_SETCONSOLE is not set -# CONFIG_SETKEYCODES is not set - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -CONFIG_READLINK=y -# CONFIG_FEATURE_READLINK_FOLLOW is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_START_STOP_DAEMON is not set -CONFIG_WHICH=y - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_E2FSCK is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_MKE2FS is not set -# CONFIG_TUNE2FS is not set -# CONFIG_E2LABEL is not set -# CONFIG_FINDFS is not set - -# -# Editors -# -# CONFIG_AWK is not set -# CONFIG_FEATURE_AWK_MATH is not set -# CONFIG_PATCH is not set -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -CONFIG_FEATURE_FIND_EXEC=y -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y - -# -# Init Utilities -# -CONFIG_INIT=y -CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_INITRD=y -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INIT_SCTTY is not set -CONFIG_FEATURE_EXTRA_QUIET=y -CONFIG_HALT=y -# CONFIG_MESG is not set -CONFIG_POWEROFF=y -CONFIG_REBOOT=y - -# -# Login/Password Management Utilities -# -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_ADDGROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_ADDUSER is not set -# CONFIG_DELUSER is not set -# CONFIG_GETTY is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set -# CONFIG_LOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_SU is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_CROND is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_EJECT is not set -# CONFIG_LAST is not set -# CONFIG_LESS is not set -# CONFIG_FEATURE_LESS_BRACKETS is not set -# CONFIG_FEATURE_LESS_FLAGS is not set -# CONFIG_FEATURE_LESS_FLAGCS is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# BB_APPLET_RUNLEVEL is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -# CONFIG_SETSID is not set -CONFIG_TIME=y -# CONFIG_WATCHDOG is not set - -# -# Linux Module Utilities -# -# CONFIG_INSMOD is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -# CONFIG_RMMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_2_6_MODULES is not set -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set - -# -# Networking Utilities -# -# CONFIG_FEATURE_IPV6 is not set -# CONFIG_ARPING is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -# CONFIG_FEATURE_IFCONFIG_HW is not set -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set -# CONFIG_IFUPDOWN is not set -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_IPX is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -# CONFIG_IP is not set -# CONFIG_FEATURE_IP_ADDRESS is not set -# CONFIG_FEATURE_IP_LINK is not set -# CONFIG_FEATURE_IP_ROUTE is not set -# CONFIG_FEATURE_IP_TUNNEL is not set -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_NAMEIF is not set -# CONFIG_NC is not set -# CONFIG_NC_GAPING_SECURITY_HOLE is not set -# CONFIG_NETSTAT is not set -# CONFIG_NSLOOKUP is not set -CONFIG_PING=y -CONFIG_FEATURE_FANCY_PING=y -# CONFIG_PING6 is not set -# CONFIG_FEATURE_FANCY_PING6 is not set -CONFIG_ROUTE=y -# CONFIG_TELNET is not set -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_INETD is not set -# CONFIG_TFTP is not set -# CONFIG_FEATURE_TFTP_GET is not set -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_DEBUG is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -# CONFIG_FEATURE_WGET_IP6_LITERAL is not set - -# -# udhcp Server/Client -# -# CONFIG_UDHCPD is not set -# CONFIG_UDHCPC is not set -# CONFIG_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCP_SYSLOG is not set -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_ZCIP is not set - -# -# Process Utilities -# -CONFIG_FREE=y -# CONFIG_FUSER is not set -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_PIDOF=y -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set -CONFIG_PS=y -# CONFIG_FEATURE_PS_WIDE is not set -# CONFIG_RENICE is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -CONFIG_UPTIME=y - -# -# Shells -# -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_LASH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -CONFIG_ASH=y - -# -# Ash Shell Options -# -CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set -CONFIG_ASH_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -CONFIG_ASH_MATH_SUPPORT_64=y -# CONFIG_ASH_GETOPTS is not set -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_BUILTIN_ECHO is not set -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_ASH_EXPAND_PRMT is not set -# CONFIG_HUSH is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -# CONFIG_FEATURE_SH_EXTRA_QUIET is not set -# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set -CONFIG_FEATURE_COMMAND_EDITING=y -# CONFIG_FEATURE_COMMAND_EDITING_VI is not set -CONFIG_FEATURE_COMMAND_HISTORY=15 -CONFIG_FEATURE_COMMAND_SAVEHISTORY=y -CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y -# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set -CONFIG_FEATURE_SH_FANCY_PROMPT=y - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -CONFIG_KLOGD=y -CONFIG_LOGGER=y - -# -# Linux System Utilities -# -CONFIG_DMESG=y -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -# FDISK_SUPPORT_LARGE_DISKS is not set -# CONFIG_FEATURE_FDISK_WRITABLE is not set -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -# CONFIG_LOSETUP is not set -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_MKSWAP is not set -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_PIVOT_ROOT=y -# CONFIG_SWITCH_ROOT is not set -# CONFIG_RDATE is not set -# CONFIG_READPROFILE is not set -CONFIG_SWAPONOFF=y -CONFIG_MOUNT=y -# CONFIG_FEATURE_MOUNT_NFS is not set -CONFIG_UMOUNT=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_NO_DEBUG_LIB is not set -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set diff --git a/pkgs/misc/busybox/x86-config-1.2 b/pkgs/misc/busybox/x86-config-1.2 deleted file mode 100644 index b11852a9614..00000000000 --- a/pkgs/misc/busybox/x86-config-1.2 +++ /dev/null @@ -1,635 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -CONFIG_NITPICK=y -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -# CONFIG_FEATURE_VERBOSE_USAGE is not set -CONFIG_FEATURE_COMPRESS_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_GETOPT_LONG=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_SUID is not set -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" - -# -# Build Options -# -CONFIG_STATIC=y -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -# CONFIG_LFS is not set -# USING_CROSS_COMPILER is not set -CROSS_COMPILER_PREFIX="" -# CONFIG_BUILD_AT_ONCE is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_NO_DEBUG_LIB is not set -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set -CONFIG_DEBUG_YANK_SUSv2=y - -# -# Installation Options -# -CONFIG_INSTALL_NO_USR=y -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_MD5_SIZE_VS_SPEED=2 - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -CONFIG_BUNZIP2=y -# CONFIG_CPIO is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set -# CONFIG_GZIP is not set -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y -# CONFIG_FEATURE_TAR_LZMA is not set -# CONFIG_FEATURE_TAR_FROM is not set -CONFIG_FEATURE_TAR_GZIP=y -# CONFIG_FEATURE_TAR_COMPRESS is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set -# CONFIG_FEATURE_DEB_TAR_GZ is not set -# CONFIG_FEATURE_DEB_TAR_BZ2 is not set -# CONFIG_FEATURE_DEB_TAR_LZMA is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -# CONFIG_CATV is not set -# CONFIG_CHGRP is not set -CONFIG_CHMOD=y -# CONFIG_CHOWN is not set -# CONFIG_CHROOT is not set -# CONFIG_CKSUM is not set -# CONFIG_CMP is not set -# CONFIG_COMM is not set -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -# CONFIG_DD is not set -# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set -# CONFIG_FEATURE_DD_IBS_OBS is not set -# CONFIG_DF is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_BINARY is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_FEATURE_DIFF_MINIMAL is not set -# CONFIG_DIRNAME is not set -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -# CONFIG_DU is not set -# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -# CONFIG_ENV is not set -# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set -# CONFIG_EXPR is not set -# CONFIG_EXPR_MATH_SUPPORT_64 is not set -# CONFIG_FALSE is not set -# CONFIG_FOLD is not set -# CONFIG_HEAD is not set -# CONFIG_FEATURE_FANCY_HEAD is not set -# CONFIG_HOSTID is not set -# CONFIG_ID is not set -# CONFIG_INSTALL is not set -# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LENGTH is not set -CONFIG_LN=y -# CONFIG_LOGNAME is not set -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -# CONFIG_MD5SUM is not set -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -# CONFIG_MKFIFO is not set -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set -# CONFIG_OD is not set -# CONFIG_PRINTENV is not set -# CONFIG_PRINTF is not set -# CONFIG_PWD is not set -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -# CONFIG_SEQ is not set -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -# CONFIG_STAT is not set -# CONFIG_FEATURE_STAT_FORMAT is not set -# CONFIG_STTY is not set -# CONFIG_SUM is not set -CONFIG_SYNC=y -# CONFIG_TAIL is not set -# CONFIG_FEATURE_FANCY_TAIL is not set -CONFIG_TEE=y -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TEST=y -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -CONFIG_TRUE=y -# CONFIG_TTY is not set -# CONFIG_UNAME is not set -# CONFIG_UNIQ is not set -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -# CONFIG_WATCH is not set -# CONFIG_WC is not set -# CONFIG_WHO is not set -# CONFIG_WHOAMI is not set -# CONFIG_YES is not set - -# -# Common options for cp and mv -# -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -# CONFIG_FEATURE_HUMAN_READABLE is not set -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -# CONFIG_LOADFONT is not set -# CONFIG_LOADKMAP is not set -# CONFIG_OPENVT is not set -# CONFIG_RESET is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set - -# -# Debian Utilities -# -# CONFIG_MKTEMP is not set -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_READLINK is not set -# CONFIG_FEATURE_READLINK_FOLLOW is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -CONFIG_START_STOP_DAEMON=y -CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y -# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_WHICH is not set - -# -# Editors -# -# CONFIG_AWK is not set -# CONFIG_FEATURE_AWK_MATH is not set -# CONFIG_ED is not set -# CONFIG_PATCH is not set -# CONFIG_SED is not set -CONFIG_VI=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y - -# -# Finding Utilities -# -# CONFIG_FIND is not set -# CONFIG_FEATURE_FIND_PRINT0 is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -# CONFIG_FEATURE_FIND_TYPE is not set -# CONFIG_FEATURE_FIND_XDEV is not set -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_INIT is not set -# CONFIG_DEBUG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_HALT=y -CONFIG_MESG=y - -# -# Login/Password Management Utilities -# -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_ADDGROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_ADDUSER is not set -# CONFIG_DELUSER is not set -# CONFIG_GETTY is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set -# CONFIG_LOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_SU is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -CONFIG_E2FSCK=y -CONFIG_FSCK=y -# CONFIG_LSATTR is not set -CONFIG_MKE2FS=y -CONFIG_TUNE2FS=y -CONFIG_E2LABEL=y -# CONFIG_FINDFS is not set - -# -# Linux Module Utilities -# -# CONFIG_INSMOD is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -# CONFIG_RMMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_2_6_MODULES is not set -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set - -# -# Linux System Utilities -# -# CONFIG_DMESG is not set -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_GETOPT is not set -# CONFIG_HEXDUMP is not set -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -# CONFIG_LOSETUP is not set -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -CONFIG_MKSWAP=y -# CONFIG_FEATURE_MKSWAP_V0 is not set -# CONFIG_MORE is not set -# CONFIG_FEATURE_USE_TERMIOS is not set -CONFIG_MOUNT=y -# CONFIG_FEATURE_MOUNT_NFS is not set -# CONFIG_PIVOT_ROOT is not set -# CONFIG_RDATE is not set -# CONFIG_READPROFILE is not set -# CONFIG_SETARCH is not set -CONFIG_SWAPONOFF=y -# CONFIG_SWITCH_ROOT is not set -CONFIG_UMOUNT=y -# CONFIG_FEATURE_UMOUNT_ALL is not set - -# -# Common options for mount/umount -# -# CONFIG_FEATURE_MOUNT_LOOP is not set -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_CROND is not set -# CONFIG_DEBUG_CROND_OPTION is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -CONFIG_EJECT=y -# CONFIG_LAST is not set -# CONFIG_LESS is not set -# CONFIG_FEATURE_LESS_BRACKETS is not set -# CONFIG_FEATURE_LESS_FLAGS is not set -# CONFIG_FEATURE_LESS_FLAGCS is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -# CONFIG_STRINGS is not set -# CONFIG_SETSID is not set -# CONFIG_TASKSET is not set -# CONFIG_TIME is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -# CONFIG_FEATURE_IPV6 is not set -# CONFIG_ARPING is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -# CONFIG_HOSTNAME is not set -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_IFCONFIG is not set -# CONFIG_FEATURE_IFCONFIG_STATUS is not set -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -# CONFIG_FEATURE_IFCONFIG_HW is not set -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set -# CONFIG_IFUPDOWN is not set -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_IPX is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -# CONFIG_IP is not set -# CONFIG_FEATURE_IP_ADDRESS is not set -# CONFIG_FEATURE_IP_LINK is not set -# CONFIG_FEATURE_IP_ROUTE is not set -# CONFIG_FEATURE_IP_TUNNEL is not set -# CONFIG_FEATURE_IP_SHORT_FORMS is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -# CONFIG_NC is not set -# CONFIG_NC_GAPING_SECURITY_HOLE is not set -# CONFIG_NETSTAT is not set -# CONFIG_NSLOOKUP is not set -# CONFIG_PING is not set -# CONFIG_FEATURE_FANCY_PING is not set -# CONFIG_PING6 is not set -# CONFIG_FEATURE_FANCY_PING6 is not set -# CONFIG_ROUTE is not set -# CONFIG_TELNET is not set -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_INETD is not set -# CONFIG_TFTP is not set -# CONFIG_FEATURE_TFTP_GET is not set -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_DEBUG_TFTP is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set - -# -# udhcp Server/Client -# -# CONFIG_APP_UDHCPD is not set -# CONFIG_APP_UDHCPC is not set -# CONFIG_APP_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCP_SYSLOG is not set -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_VCONFIG is not set -# CONFIG_WGET is not set -# CONFIG_FEATURE_WGET_STATUSBAR is not set -# CONFIG_FEATURE_WGET_AUTHENTICATION is not set -# CONFIG_FEATURE_WGET_IP6_LITERAL is not set -# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set -# CONFIG_ZCIP is not set - -# -# Process Utilities -# -# CONFIG_FREE is not set -# CONFIG_FUSER is not set -# CONFIG_KILL is not set -# CONFIG_KILLALL is not set -# CONFIG_PIDOF is not set -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set -# CONFIG_PS is not set -# CONFIG_FEATURE_PS_WIDE is not set -# CONFIG_RENICE is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_UPTIME is not set - -# -# Shells -# -# CONFIG_FEATURE_SH_IS_ASH is not set -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_LASH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -CONFIG_FEATURE_SH_IS_NONE=y -CONFIG_ASH=y - -# -# Ash Shell Options -# -CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set -CONFIG_ASH_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -# CONFIG_ASH_GETOPTS is not set -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_TEST=y -# CONFIG_ASH_CMDCMD is not set -CONFIG_ASH_MAIL=y -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_ASH_EXPAND_PRMT is not set -# CONFIG_HUSH is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -# CONFIG_FEATURE_SH_EXTRA_QUIET is not set -# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set -# CONFIG_FEATURE_COMMAND_EDITING is not set -# CONFIG_FEATURE_COMMAND_EDITING_VI is not set -CONFIG_FEATURE_COMMAND_HISTORY=0 -# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set -# CONFIG_FEATURE_COMMAND_TAB_COMPLETION is not set -# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set -# CONFIG_FEATURE_SH_FANCY_PROMPT is not set - -# -# System Logging Utilities -# -# CONFIG_SYSLOGD is not set -# CONFIG_FEATURE_ROTATE_LOGFILE is not set -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -# CONFIG_KLOGD is not set -# CONFIG_LOGGER is not set diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 0811e8e3e80..278db745d60 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation { -e 's@^RUNTIME_PREFIX.*@RUNTIME_PREFIX="/"@' \ -e 's@^DEVEL_PREFIX.*@DEVEL_PREFIX="/"@' \ -e 's@.*UCLIBC_HAS_WCHAR.*@UCLIBC_HAS_WCHAR=y@' \ + -e 's@.*UCLIBC_HAS_RPC.*@UCLIBC_HAS_RPC=y@' \ -e 's@.*DO_C99_MATH.*@DO_C99_MATH=y@' \ -e 's@.*UCLIBC_HAS_PROGRAM_INVOCATION_NAME.*@UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y@' \ ${configArmEABI} \ From 33e549fa4f032feb66e73ddb2b83ff60f4c27ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 9 Mar 2010 22:44:45 +0000 Subject: [PATCH 005/313] Adding a busybox option to build it statically. Adding it to the cross builds. svn path=/nixpkgs/trunk/; revision=20516 --- pkgs/misc/busybox/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 3 ++- pkgs/top-level/release-cross.nix | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix index 61de814ad74..26d2e050fb7 100644 --- a/pkgs/misc/busybox/default.nix +++ b/pkgs/misc/busybox/default.nix @@ -1,11 +1,14 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, enableStatic ? false}: let basicConfigure = '' make defconfig sed -i 's,.*CONFIG_PREFIX.*,CONFIG_PREFIX="'$out'",' .config sed -i 's,.*CONFIG_INSTALL_NO_USR.*,CONFIG_INSTALL_NO_USR=y,' .config - ''; + '' + + (if enableStatic then '' + sed -i 's,.*CONFIG_STATIC.*,CONFIG_STATIC=y,' .config + '' else ""); in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6333cc0e91..213c4d4e765 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8915,8 +8915,9 @@ let inherit stdenv fetchurl emacs texLive; }; - busybox = import ../misc/busybox { + busybox = makeOverridable (import ../misc/busybox) { inherit fetchurl stdenv; + enableStatic = true; }; cups = import ../misc/cups { diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index fdac71e2da3..695ee1c38e6 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -5,6 +5,7 @@ let /* Basic list of packages to cross-build */ basicHostDrv = { bison.hostDrv = nativePlatforms; + busybox.hostDrv = nativePlatforms; tightvnc.hostDrv = nativePlatforms; #openoffice.hostDrv = nativePlatforms; wxGTK.hostDrv = nativePlatforms; From dbf2a748298adad25c6befd5109b463a22dab957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 9 Mar 2010 22:47:22 +0000 Subject: [PATCH 006/313] TeXLive: Building the format files, again. svn path=/nixpkgs/trunk/; revision=20517 --- pkgs/misc/tex/texlive/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/tex/texlive/default.nix b/pkgs/misc/tex/texlive/default.nix index eadabb9b339..e72d9112daa 100644 --- a/pkgs/misc/tex/texlive/default.nix +++ b/pkgs/misc/tex/texlive/default.nix @@ -60,9 +60,16 @@ rec { HOME=. PATH=$PATH:$out/bin updmap-sys --syncwithtrees # Prebuild the format files, as it used to be done with TeXLive 2007. + # Luatex currently fails this way: + # + # This is a summary of all `failed' messages: + # `luatex -ini -jobname=luatex -progname=luatex luatex.ini' failed + # `luatex -ini -jobname=dviluatex -progname=dviluatex dviluatex.ini' failed + # + # I find it acceptable, hence the "|| true". echo "building format files..." ensureDir "$out/texmf-var/web2c" - PATH="$PATH:$out/bin" fmtutil-sys --all + PATH="$PATH:$out/bin" fmtutil-sys --all || true PATH=$PATH:$out/bin mktexlsr $out/texmf* '') ["minInit" "defEnsureDir" "doUnpack" "doMakeInstall"]; From 12e960f592f8cfa1faadc05cb0111bfd59a0eb7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 9 Mar 2010 23:11:12 +0000 Subject: [PATCH 007/313] Adding dropbear, a small implementation of ssh2 client and server. I made it statically build by default I had to fix the zlib static cross-build, because the native stripping corrupted the target static library. It is not the first time I see this. I add drobear to the cross-built packages for hydra. svn path=/nixpkgs/trunk/; revision=20518 --- pkgs/development/libraries/zlib/default.nix | 4 ++++ pkgs/tools/networking/dropbear/default.nix | 22 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++++ pkgs/top-level/release-cross.nix | 1 + 4 files changed, 33 insertions(+) create mode 100644 pkgs/tools/networking/dropbear/default.nix diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index b4ae9e63ea0..95c891e9bc7 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation { fi ''; + crossAttrs = { + dontStrip = if static then true else false; + }; + # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv. cygwinConfigureEnableShared = true; } diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix new file mode 100644 index 00000000000..986c9806591 --- /dev/null +++ b/pkgs/tools/networking/dropbear/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, zlib, enableStatic ? false }: + +stdenv.mkDerivation rec { + name = "dropbear-0.52"; + + src = fetchurl { + url = http://matt.ucc.asn.au/dropbear/releases/dropbear-0.52.tar.bz2; + sha256 = "1h84dwld8qm19m0a1zslm2ssz65nr93irw7p2h5fjrlh9ix74ywc"; + }; + + dontDisableStatic = enableStatic; + + configureFlags = stdenv.lib.optional enableStatic "LDFLAGS=-static"; + + buildInputs = [ zlib ]; + + meta = { + homepage = http://matt.ucc.asn.au/dropbear/dropbear.html; + description = "An small footprint implementation of the SSH 2 protocol"; + license = "mit"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 213c4d4e765..ea0da345672 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -630,6 +630,12 @@ let inherit builderDefs; }; + dropbear = makeOverridable (import ../tools/networking/dropbear) { + inherit fetchurl stdenv; + enableStatic = true; + zlib = zlibStatic; + }; + duplicity = import ../tools/backup/duplicity { inherit fetchurl stdenv librsync gnupg makeWrapper python; inherit (pythonPackages) boto; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 695ee1c38e6..7d4173bd988 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -6,6 +6,7 @@ let basicHostDrv = { bison.hostDrv = nativePlatforms; busybox.hostDrv = nativePlatforms; + dropbear.hostDrv = nativePlatforms; tightvnc.hostDrv = nativePlatforms; #openoffice.hostDrv = nativePlatforms; wxGTK.hostDrv = nativePlatforms; From 8c2af71a0f55e6968c3f5897f5cba32904899193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 10 Mar 2010 09:15:20 +0000 Subject: [PATCH 008/313] Fixing the gcc-cross-wrapper (wanting to make it work with uclibc, I had broken it for glibc). Now I tested that it works for both. svn path=/nixpkgs/trunk/; revision=20519 --- pkgs/build-support/gcc-cross-wrapper/builder.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh index 86d18ced54e..e71e1742720 100644 --- a/pkgs/build-support/gcc-cross-wrapper/builder.sh +++ b/pkgs/build-support/gcc-cross-wrapper/builder.sh @@ -7,8 +7,11 @@ cflagsCompile="-B$out/bin/" if test -z "$nativeLibc"; then cflagsCompile="$cflagsCompile -B$libc/lib/ -isystem $libc/include" ldflags="$ldflags -L$libc/lib" + # Get the proper dynamic linker for glibc and uclibc. dlinker=`eval 'echo $libc/lib/ld-*.so.?'` - ldflagsBefore="-dynamic-linker $dlinker" + if [ -n "$dlinker" ]; then + ldflagsBefore="-dynamic-linker $dlinker" + fi fi if test -n "$nativeTools"; then From 854b22a24e5e2503da60bf8c96ba3bd14fdaa3bd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Mar 2010 09:58:19 +0000 Subject: [PATCH 009/313] * Updated nixSqlite. svn path=/nixpkgs/trunk/; revision=20520 --- pkgs/tools/package-management/nix/sqlite.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix index 84bae213427..d28ab19b54b 100644 --- a/pkgs/tools/package-management/nix/sqlite.nix +++ b/pkgs/tools/package-management/nix/sqlite.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "nix-0.15pre20408"; + name = "nix-0.15pre20493"; src = fetchurl { - url = "http://hydra.nixos.org/build/310943/download/4/${name}.tar.bz2"; - sha256 = "f94d95981db9093604c843225aa9f9dfe82d3352cb1ecba92de03d117d9bb4b9"; + url = "http://hydra.nixos.org/build/316254/download/4/${name}.tar.bz2"; + sha256 = "da80ea3beaf9c6c62620850ff770202f43553a6719bb8046eb2be6ece4a26fec"; }; buildInputs = [perl curl openssl]; From 013ead070aad51244eef13d01460995f0f962984 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Wed, 10 Mar 2010 19:34:16 +0000 Subject: [PATCH 010/313] update to 2.8.2 svn path=/nixpkgs/trunk/; revision=20537 --- pkgs/applications/office/abiword/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index b7aecdfd03d..fceb5a04e6e 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -3,10 +3,10 @@ enchant, wv, librsvg, bzip2 }: stdenv.mkDerivation { - name = "abiword-2.8.1"; + name = "abiword-2.8.2"; src = fetchurl { - url = http://www.abisource.org/downloads/abiword/2.8.1/source/abiword-2.8.1.tar.gz; - sha256 = "1v6jkjd5ivaarhv41nkniqycx3k33p9r7q7dyyjn7kq2295n26zm"; + url = http://www.abisource.org/downloads/abiword/2.8.2/source/abiword-2.8.2.tar.gz; + sha256 = "176v0c41453qspz958s9jlsbh1sdg61j7cpdp86x93lsci3qyrnb"; }; buildInputs = [pkgconfig gtk libglade librsvg bzip2 From 57ea53f67a6e28d77b17aebda96692018bf88e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 10 Mar 2010 20:44:40 +0000 Subject: [PATCH 011/313] Adding rapidsvn svn path=/nixpkgs/trunk/; revision=20538 --- .../version-management/rapidsvn/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/version-management/rapidsvn/default.nix diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix new file mode 100644 index 00000000000..3a22338ed7e --- /dev/null +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python}: + +stdenv.mkDerivation { + name = "rapidsvn-0.12"; + + src = fetchurl { + url = http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz; + sha256 = "1i3afjmx99ljw1bj54q47fs0g1q9dmxxvr4ciq7ncp5s52shszgg"; + }; + + buildInputs = [ wxGTK subversion apr aprutil python ]; + + configureFlags = [ "--with-svn-include=${subversion}/include" + "--with-svn-lib=${subversion}/lib" ]; + + meta = { + description = "Multi-platform GUI front-end for the Subversion revision system"; + homepage = http://rapidsvn.tigris.org/; + license = "GPLv3+"; + maintainers = [ stdenv.lib.maintainers.viric ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea0da345672..dfa4928b2d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7960,6 +7960,10 @@ let openexr = openexr_1_6_1; }; + rapidsvn = import ../applications/version-management/rapidsvn { + inherit fetchurl stdenv wxGTK subversion apr aprutil python; + }; + ratpoison = import ../applications/window-managers/ratpoison { inherit fetchurl stdenv fontconfig readline pkgconfig autoconf automake; inherit (xlibs) libX11 inputproto libXt libXpm libXft From 648b17197ff0812c9f94816e134001ce918a26c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 10 Mar 2010 20:44:48 +0000 Subject: [PATCH 012/313] Adding linux 2.4 kernel headers for cross builds. (I'm thinking of OpenWRT machines out there, mips, with linux 2.4) svn path=/nixpkgs/trunk/; revision=20539 --- pkgs/top-level/all-packages.nix | 15 ++++++++++++++- pkgs/top-level/platforms.nix | 3 +++ pkgs/top-level/release-cross.nix | 10 ++++++---- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfa4928b2d3..37c6e5238b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5891,11 +5891,24 @@ let linuxHeaders = linuxHeaders_2_6_28; - linuxHeadersCross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { + linuxHeaders26Cross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { inherit stdenv fetchurl perl; cross = assert crossSystem != null; crossSystem; }); + linuxHeaders24Cross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.4.nix { + inherit stdenv fetchurl perl; + cross = assert crossSystem != null; crossSystem; + }); + + # We can choose: + linuxHeadersCrossChooser = ver : if (ver == "2.4") then linuxHeaders24Cross + else if (ver == "2.6") then linuxHeaders26Cross + else throw "Unknown linux kernel version"; + + linuxHeadersCross = assert crossSystem != null; + linuxHeadersCrossChooser crossSystem.platform.kernelMajor; + linuxHeaders_2_6_18 = import ../os-specific/linux/kernel-headers/2.6.18.5.nix { inherit fetchurl stdenv unifdef; }; diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 3c680cac9e4..eb2943f8c70 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -26,6 +26,7 @@ rec { sheevaplug = { name = "sheevaplug"; + kernelMajor = "2.6"; kernelHeadersBaseConfig = "kirkwood_defconfig"; kernelBaseConfig = "kirkwood_defconfig"; kernelArch = "arm"; @@ -69,6 +70,7 @@ rec { versatileARM = { name = "versatileARM"; + kernelMajor = "2.6"; kernelHeadersBaseConfig = "versatile_defconfig"; kernelBaseConfig = "versatile_defconfig"; kernelArch = "arm"; @@ -106,6 +108,7 @@ rec { integratorCP = { name = "integratorCP"; + kernelMajor = "2.6"; kernelHeadersBaseConfig = "integrator_defconfig"; kernelBaseConfig = "integrator_defconfig"; kernelArch = "arm"; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 7d4173bd988..37ecda0e027 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -80,20 +80,21 @@ let arch = "mips"; float = "soft"; withTLS = true; - libc = "glibc"; + libc = "uclibc"; platform = { name = "malta"; + kernelMajor = "2.4"; kernelBaseConfig = "malta_defconfig"; - kernelHeadersBaseConfig = "malta_defconfig"; + kernelHeadersBaseConfig = "defconfig-malta"; uboot = null; kernelArch = "mips"; kernelAutoModules = false; - kernelTarget = "vmlinux.bin"; + kernelTarget = "vmlinux"; }; openssl.system = "linux-generic32"; }; in { - crossMipselLinux = mapTestOnCross crossSystem basic; + crossMipselLinux24 = mapTestOnCross crossSystem basic; }) // ( /* Test some cross builds to the ultrasparc */ @@ -108,6 +109,7 @@ let libc = "glibc"; platform = { name = "ultrasparc"; + kernelMajor = "2.6"; kernelHeadersBaseConfig = "sparc64_defconfig"; kernelBaseConfig = "sparc64_defconfig"; kernelArch = "sparc"; From 5b7f1ef09a10adc515e3386bd0cb38fb3e4167a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 10 Mar 2010 21:32:35 +0000 Subject: [PATCH 013/313] Making busybox cross build with kernel 2.4 for mipsel (I had to disable 'ionice', which requires some headers >= 2.6.12). I also add the kernel 2.4 headers expression I forgot in my last commit. svn path=/nixpkgs/trunk/; revision=20540 --- pkgs/misc/busybox/default.nix | 5 +- pkgs/os-specific/linux/kernel-headers/2.4.nix | 54 +++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel-headers/2.4.nix diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix index 26d2e050fb7..1d190cf661d 100644 --- a/pkgs/misc/busybox/default.nix +++ b/pkgs/misc/busybox/default.nix @@ -25,6 +25,9 @@ stdenv.mkDerivation { crossAttrs = { configurePhase = basicConfigure + '' sed -i 's,.*CONFIG_CROSS_COMPILER_PREFIX.*,CONFIG_CROSS_COMPILER_PREFIX="'$crossConfig-'",' .config - ''; + '' + + (if (stdenv.cross.platform.kernelMajor == "2.4") then '' + sed -i 's,.*CONFIG_IONICE.*,CONFIG_IONICE=n,' .config + '' else ""); }; } diff --git a/pkgs/os-specific/linux/kernel-headers/2.4.nix b/pkgs/os-specific/linux/kernel-headers/2.4.nix new file mode 100644 index 00000000000..c179801ca55 --- /dev/null +++ b/pkgs/os-specific/linux/kernel-headers/2.4.nix @@ -0,0 +1,54 @@ +{stdenv, fetchurl, perl, cross ? null}: + +assert cross == null -> stdenv.isLinux; + +let + version = "2.4.37.9"; + kernelHeadersBaseConfig = if (cross == null) then + stdenv.platform.kernelHeadersBaseConfig + else + cross.platform.kernelHeadersBaseConfig; +in + +stdenv.mkDerivation { + name = "linux-headers-${version}"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v2.4/linux-${version}.tar.bz2"; + sha256 = "08rca9lcb5l5w483hgaqk8pi2njd7cmwpkifjqxwlb3g8liz4r5g"; + }; + + targetConfig = if (cross != null) then cross.config else null; + + platform = + if cross != null then cross.platform.kernelArch else + if stdenv.system == "i686-linux" then "i386" else + if stdenv.system == "x86_64-linux" then "x86_64" else + if stdenv.system == "powerpc-linux" then "powerpc" else + if stdenv.system == "armv5tel-linux" then "arm" else + abort "don't know what the kernel include directory is called for this platform"; + + buildInputs = [perl]; + + patchPhase = '' + sed -i s,/bin/pwd,pwd, Makefile + ''; + + extraIncludeDirs = + if cross != null then + (if cross.arch == "powerpc" then ["ppc"] else []) + else if stdenv.system == "powerpc-linux" then ["ppc"] else []; + + buildPhase = '' + cp arch/$platform/${kernelHeadersBaseConfig} .config + make mrproper symlinks include/linux/{version,compile}.h \ + ARCH=$platform + yes "" | make oldconfig ARCH=$platform + ''; + + installPhase = '' + ensureDir $out/include + cp -a include/{asm,asm-$platform,acpi,linux,pcmcia,scsi,video} \ + $out/include + ''; +} From 4a44d3244429c35444938bec2307a321966fa90f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 10 Mar 2010 22:22:43 +0000 Subject: [PATCH 014/313] Made tcpdump crossbuild. svn path=/nixpkgs/trunk/; revision=20543 --- pkgs/development/libraries/libpcap/default.nix | 8 +++++++- pkgs/tools/networking/tcpdump/default.nix | 10 +++++++++- .../tools/networking/tcpdump/disable-ipv6.patch | 17 +++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/networking/tcpdump/disable-ipv6.patch diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index fbd73230d73..0b91460e8e3 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -8,11 +8,17 @@ stdenv.mkDerivation rec { sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552"; }; - buildInputs = [ flex bison ]; + buildNativeInputs = [ flex bison ]; configureFlags = "--with-pcap=linux"; preInstall = ''ensureDir $out/bin''; patches = [ ./libpcap_amd64.patch ]; + + crossAttrs = { + # Stripping hurts in static libraries + dontStrip = true; + configureFlags = [ "--with-pcap=linux" "ac_cv_linux_vers=2" ]; + }; } diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index b7b00599616..939bc400eae 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap }: +{ stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { name = "tcpdump-4.0.0"; @@ -10,6 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ]; + patches = [ ./disable-ipv6.patch ]; + + crossAttrs = { + LDFLAGS = if enableStatic then "-static" else ""; + configureFlags = [ "ac_cv_linux_vers=2" ] ++ (stdenv.lib.optional + (stdenv.cross.platform.kernelMajor == "2.4") "--disable-ipv6"); + }; + meta = { description = "tcpdump, a famous network sniffer"; homepage = http://www.tcpdump.org/; diff --git a/pkgs/tools/networking/tcpdump/disable-ipv6.patch b/pkgs/tools/networking/tcpdump/disable-ipv6.patch new file mode 100644 index 00000000000..0c869369faa --- /dev/null +++ b/pkgs/tools/networking/tcpdump/disable-ipv6.patch @@ -0,0 +1,17 @@ +Needed for proper building with ipv6 disabled +http://marc.info/?l=tcpdump-workers&m=122606195828825&w=2 +--- a/print-enc.c 2008-11-04 16:24:30 +0000 ++++ b/print-enc.c 2008-11-04 16:45:04 +0000 +@@ -77,9 +77,11 @@ + case AF_INET: + ip_print(gndo, p, length); + break; ++#ifdef INET6 + case AF_INET6: + ip6_print(p, length); + break; ++#endif /*INET6*/ + } + + out: + From c22cc79a9e5c0774ea3179b2e4e375409ec034aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 11 Mar 2010 10:51:53 +0000 Subject: [PATCH 015/313] Latest Nix from `trunk'. svn path=/nixpkgs/trunk/; revision=20549 --- pkgs/tools/package-management/nix/unstable.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 8687a4af884..70c82b062f6 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "nix-0.15pre20427"; - + name = "nix-0.15pre20548"; + src = fetchurl { url = "http://hydra.nixos.org/build/311195/download/4/${name}.tar.bz2"; - sha256 = "844e5878d55a68ae2aac657718a1960dcfc943f6738ebdfb2bc93e8c462d0ad7"; + sha256 = "1fiixfs53f8d54jadzzx2akqkdpz6ncbhixb6bkrnrgxbfjdydrr"; }; buildNativeInputs = [perl]; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; - license = "LGPL"; + license = "LGPLv2+"; }; } From 62a4d66a4846c6149bd7abe98482a62559a5272f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 11 Mar 2010 11:15:58 +0000 Subject: [PATCH 016/313] Fix URL of `nixUnstable'. svn path=/nixpkgs/trunk/; revision=20551 --- pkgs/tools/package-management/nix/unstable.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 70c82b062f6..9e1e1538806 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "nix-0.15pre20548"; src = fetchurl { - url = "http://hydra.nixos.org/build/311195/download/4/${name}.tar.bz2"; + url = "http://hydra.nixos.org/build/322035/download/4/${name}.tar.bz2"; sha256 = "1fiixfs53f8d54jadzzx2akqkdpz6ncbhixb6bkrnrgxbfjdydrr"; }; From 274522341409150b8f2db4c4fc98ec9facaef9c5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Mar 2010 11:36:40 +0000 Subject: [PATCH 017/313] * Updated nixSqlite. svn path=/nixpkgs/trunk/; revision=20552 --- pkgs/tools/package-management/nix/sqlite.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix index d28ab19b54b..250bb9d0225 100644 --- a/pkgs/tools/package-management/nix/sqlite.nix +++ b/pkgs/tools/package-management/nix/sqlite.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "nix-0.15pre20493"; + name = "nix-0.15pre20550"; src = fetchurl { - url = "http://hydra.nixos.org/build/316254/download/4/${name}.tar.bz2"; - sha256 = "da80ea3beaf9c6c62620850ff770202f43553a6719bb8046eb2be6ece4a26fec"; + url = "http://hydra.nixos.org/build/322096/download/4/${name}.tar.bz2"; + sha256 = "62009e1111a282d2b3ab8e57ceefe7b9574a7d208c4da19830066c10e0e999dc"; }; buildInputs = [perl curl openssl]; From addc98c02f96eeef1df9bd2ae138746451da2df4 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 11 Mar 2010 14:44:17 +0000 Subject: [PATCH 018/313] initial version for maven builder svn path=/nixpkgs/trunk/; revision=20558 --- pkgs/build-support/release/default.nix | 4 + pkgs/build-support/release/maven-build.nix | 97 ++++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 pkgs/build-support/release/maven-build.nix diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index 357a5227cbd..b7a362aa9f9 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -18,6 +18,10 @@ rec { { inherit stdenv; } // args); + mvnBuild = args: import ./maven-build.nix ( + { inherit stdenv; + } // args); + nixBuild = args: import ./nix-build.nix ( { inherit stdenv; } // args); diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix new file mode 100644 index 00000000000..8fbd7f0677b --- /dev/null +++ b/pkgs/build-support/release/maven-build.nix @@ -0,0 +1,97 @@ +{ stdenv +, name +, src +, doTest ? true +, doTestCompile ? true +, doJavadoc ? false +, doCheckstyle ? false +, doRelease ? false +, includeTestClasses ? true + +, ... +} @ args : + +let + mvnFlags = "-Dmaven.repo.local=$M2_REPO ${if doTest then "" else "-Dmaven.test.skip.exec=true"}"; +in + +stdenv.mkDerivation ( rec { + inherit name src; + phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest mvnCobertura" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase"; + + setupPhase = '' + runHook preSetupPhase + + ensureDir $out/nix-support + export LANG="en_US.UTF-8" + export LOCALE_ARCHIVE=$glibcLocales/lib/locale/locale-archive + export M2_REPO=$TMPDIR/repository + + runHook postSetupPhase + ''; + + mvnCompile = '' + mvn compile ${mvnFlags} + ''; + + mvnTestCompile = '' + mvn test-compile ${mvnFlags} + ''; + + mvnTestJar = '' + mvn jar:test-jar ${mvnFlags} + ''; + + mvnTest = '' + mvn test ${mvnFlags} + ''; + + mvnJavadoc = '' + mvn javadoc:javadoc ${mvnFlags} + cp -R target/site/apidocs $out/apidocs + echo "report javadoc $out/apidocs" >> $out/nix-support/hydra-build-products + ''; + + mvnCobertura = '' + mvn cobertura:cobertura ${mvnFlags} + cp -R target/site/cobertura $out/cobertura + echo "report cobertura $out/cobertura" >> $out/nix-support/hydra-build-products + ''; + + mvnCheckstyle = '' + mvn checkstyle:checkstyle ${mvnFlags} + ensureDir $out/checkstyle + cp -R target/site/checkstyle.* $out/checkstyle/ + cp -R target/site/images $out/checkstyle/images + echo "report checkstyle $out/checkstyle/checkstyle.html" >> $out/nix-support/hydra-build-products + ''; + + mvnJar = '' + mvn jar:jar ${mvnFlags} + ''; + + mvnAssembly = '' + mvn assembly:assembly ${mvnFlags} + ''; + + mvnRelease = '' + ensureDir $out/release +ls -l target/ + zip=$(ls target/*.zip| head -1) + releaseName=$(basename $zip .zip) + releaseName="$releaseName-r${toString src.rev}" + cp $zip $out/release/$releaseName.zip + + echo "$releaseName" > $out/nix-support/hydra-release-name + + ${if doRelease then '' + echo "file zip $out/release/$releaseName.zip" >> $out/nix-support/hydra-build-products + '' else ""} + ''; + + finalPhase = '' + ensureDir $out/site + cp -R src/test/site/* $out/site + ''; +} // args +) From b377b0233b868401423ba732d1177a14aba2abd4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Mar 2010 16:08:55 +0000 Subject: [PATCH 019/313] * OpenSSH updated to 5.4. svn path=/nixpkgs/trunk/; revision=20567 --- pkgs/tools/networking/openssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index a46762a4a4f..57e0f50a243 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { - name = "openssh-5.3p1"; + name = "openssh-5.4p1"; src = fetchurl { url = "ftp://ftp.nluug.nl/pub/security/OpenSSH/${name}.tar.gz"; - sha256 = "04pgqmb43p5lr5wrfnvyys8r504brghshm24n60495wn5131gjfh"; + sha256 = "0kj0qp43dn2pnkcgrbbhm2r9db448ppsmmzh22mj8j0h0h6yg5mf"; }; patchPhase = stdenv.lib.optionalString hpnSupport From 9c2c2af4b2c4518bbbf857dc7138be8015f224c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 11 Mar 2010 16:10:06 +0000 Subject: [PATCH 020/313] Latest Nix from `trunk'. svn path=/nixpkgs/trunk/; revision=20568 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 9e1e1538806..81a8b56963a 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "nix-0.15pre20548"; + name = "nix-0.15pre20560"; src = fetchurl { - url = "http://hydra.nixos.org/build/322035/download/4/${name}.tar.bz2"; - sha256 = "1fiixfs53f8d54jadzzx2akqkdpz6ncbhixb6bkrnrgxbfjdydrr"; + url = "http://hydra.nixos.org/build/322259/download/4/${name}.tar.bz2"; + sha256 = "16sjb8bdknzjqwhwlcxx1jwq3lij2lvz6vda3w1b6pjhhhclj58f"; }; buildNativeInputs = [perl]; From 2c44e4313c2edbb9ba0b96484db8602142dabeca Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Mar 2010 16:22:55 +0000 Subject: [PATCH 021/313] svn path=/nixpkgs/trunk/; revision=20570 --- pkgs/tools/package-management/nix/sqlite.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix index 250bb9d0225..445008c5858 100644 --- a/pkgs/tools/package-management/nix/sqlite.nix +++ b/pkgs/tools/package-management/nix/sqlite.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "nix-0.15pre20550"; + name = "nix-0.15pre20563"; src = fetchurl { - url = "http://hydra.nixos.org/build/322096/download/4/${name}.tar.bz2"; - sha256 = "62009e1111a282d2b3ab8e57ceefe7b9574a7d208c4da19830066c10e0e999dc"; + url = "http://hydra.nixos.org/build/322387/download/4/${name}.tar.bz2"; + sha256 = "20d2d7f231c2c92e68c8d828292ecde4e3858a95965dfc6b7066feb24659541e"; }; buildInputs = [perl curl openssl]; From 529e1900ca22ef26d6f47cea635877d613829c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 11 Mar 2010 22:03:45 +0000 Subject: [PATCH 022/313] options: Use the built-in type predicates. svn path=/nixpkgs/trunk/; revision=20580 --- pkgs/lib/options.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index 7b5351a1960..2c5e7aa208d 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -193,8 +193,8 @@ rec { else if all builtins.isFunction list then x: mergeDefaultOption (map (f: f x) list) else if all isList list then concatLists list else if all isAttrs list then fold lib.mergeAttrs {} list - else if all (x: true == x || false == x) list then fold lib.or false list - else if all (x: x == toString x) list then lib.concatStrings list + else if all builtins.isBool list then fold lib.or false list + else if all builtins.isString list then lib.concatStrings list else throw "Cannot merge values."; mergeTypedOption = typeName: predicate: merge: list: From 4b7ff33c2693438c22b5ca31985a7d41d3cf631e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 11 Mar 2010 22:03:49 +0000 Subject: [PATCH 023/313] options: Learn how to merge identical integer values. svn path=/nixpkgs/trunk/; revision=20581 --- pkgs/lib/options.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index 2c5e7aa208d..edcbfaa4830 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -195,6 +195,8 @@ rec { else if all isAttrs list then fold lib.mergeAttrs {} list else if all builtins.isBool list then fold lib.or false list else if all builtins.isString list then lib.concatStrings list + else if all builtins.isInt list && all (x: x == head list) list + then head list else throw "Cannot merge values."; mergeTypedOption = typeName: predicate: merge: list: From 7dffd9697859e8002c09caab1d30698151f432e5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Mar 2010 00:01:56 +0000 Subject: [PATCH 024/313] * Allow `overrideDerivation' to work on derivations to which `makeOverridable' has been applied (!). Ugly. svn path=/nixpkgs/trunk/; revision=20591 --- pkgs/lib/customisation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index d5c9e99727e..e6a26958ae2 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -31,7 +31,7 @@ rec { overrideDerivation = drv: f: let # Filter out special attributes. - attrs = removeAttrs drv ["meta" "passthru" "outPath" "drvPath" "hostDrv" "buildDrv" "type"]; + attrs = removeAttrs drv ["meta" "passthru" "outPath" "drvPath" "hostDrv" "buildDrv" "type" "override" "deepOverride" "origArgs"]; newDrv = derivation (attrs // (f drv)); in newDrv // { meta = if drv ? meta then drv.meta else {}; From 9dff94e2a0d5be0ac841d04c170ebf4a615e2ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 12 Mar 2010 18:44:47 +0000 Subject: [PATCH 025/313] Coccinelle 0.2.2. svn path=/nixpkgs/trunk/; revision=20600 --- pkgs/development/tools/misc/coccinelle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 6b257f2f21b..962d2dad3d3 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, ocaml, perl, python, ncurses, makeWrapper }: stdenv.mkDerivation rec { - name = "coccinelle-0.2.1"; + name = "coccinelle-0.2.2"; src = fetchurl { url = "http://coccinelle.lip6.fr/distrib/${name}.tgz"; - sha256 = "06nfk40kq0pxz38pw7j3ldkakr4bx0dlypyfg3gimx8a751i0b22"; + sha256 = "1rnhxlqwcps67nyn61xj8mf6wdja29q8m16r4jwdwxvfpnsdhwfy"; }; buildInputs = [ ocaml perl python ncurses makeWrapper ]; From 06cff980b872cb5ec304a53f697cb21e6e46f852 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sat, 13 Mar 2010 06:07:24 +0000 Subject: [PATCH 026/313] fix http server of tightvnc svn path=/nixpkgs/trunk/; revision=20601 --- pkgs/tools/admin/tightvnc/builder.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/admin/tightvnc/builder.sh b/pkgs/tools/admin/tightvnc/builder.sh index 05332fb46c2..d54bf7c761e 100644 --- a/pkgs/tools/admin/tightvnc/builder.sh +++ b/pkgs/tools/admin/tightvnc/builder.sh @@ -34,6 +34,12 @@ installPhase() { ensureDir $out/bin ensureDir $out/man/man1 ./vncinstall $out/bin $out/man + + # fix HTTP client: + t=$out/vnc + ensureDir $t + sed -i "s@/usr/local/vnc/classes@$out/vnc/classes@g" $out/bin/vncserver + cp -r classes $t } genericBuild From 19f41821675bf189c97a458c92cb663f7b531679 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sat, 13 Mar 2010 06:07:41 +0000 Subject: [PATCH 027/313] fix Scribus svn path=/nixpkgs/trunk/; revision=20602 --- pkgs/applications/office/scribus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 213d3b7ab9b..cf8e60b38aa 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { # fix rpath which is removed by cmake.. postFixup = '' - for i in $buildInputs ${stdenv.gcc.gcc}; do + for i in $buildNativeInputs ${stdenv.gcc.gcc}; do [ -d "$i/lib" ] && RPATH="$RPATH:$i/lib" [ -d "$i/lib64" ] && RPATH="$RPATH:$i/lib64" done From b2c15d8c376b5508d24bae1841ef3f3c7faf2fc4 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sat, 13 Mar 2010 06:07:44 +0000 Subject: [PATCH 028/313] git-1.7: Python is optional svn path=/nixpkgs/trunk/; revision=20603 --- .../version-management/git-and-tools/git/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 1e725a2c60a..8d4fb7aad74 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -3,6 +3,7 @@ , libxslt, tcl, tk, makeWrapper , svnSupport, subversion, perlLibs , guiSupport +, pythonSupport ? true }: # `git-svn' support requires Subversion and various Perl libraries. @@ -24,7 +25,8 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_45 libxslt ] ++ stdenv.lib.optionals guiSupport [tcl tk]; - makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} PYTHON_PATH=${python}/bin/python"; + makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " + + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1"); # FIXME: "make check" requires Sparse; the Makefile must be tweaked # so that `SPARSE_FLAGS' corresponds to the current architecture... From 65ef5d132855db161c6fbf8fd95b21511ca71387 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sat, 13 Mar 2010 06:07:46 +0000 Subject: [PATCH 029/313] mplayer-trunk update svn path=/nixpkgs/trunk/; revision=20604 --- pkgs/applications/video/MPlayer/trunk.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/MPlayer/trunk.nix b/pkgs/applications/video/MPlayer/trunk.nix index 19da6d91b7c..c5676a14167 100644 --- a/pkgs/applications/video/MPlayer/trunk.nix +++ b/pkgs/applications/video/MPlayer/trunk.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation { name = "mplayer-trunk"; - # REGION AUTO UPDATE: { name="MPlayer"; type = "svn"; url="svn://svn.mplayerhq.hu/mplayer/trunk"; } - src= sourceFromHead "MPlayer-29990.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/MPlayer-29990.tar.gz"; sha256 = "8d9ac59e7cc3e2bc9ca46281ac2c268d460e041aceac056b600205c8c5235169"; }); + # REGION AUTO UPDATE: { name="MPlayer"; type = "svn"; url="svn://svn.mplayerhq.hu/mplayer/trunk"; } + src = sourceFromHead "MPlayer-30676.tar.gz" + (fetchurl { url = "http://mawercer.de/~nix/repos/MPlayer-30676.tar.gz"; sha256 = "3d5fc038d34dfc5af15f1510f06920710d083f61f29fe31f2dfa3cdcac2a4424"; }); # END buildInputs = From 2dce3019bfaa7a90feecc9b0ac15ca8cc7d42d48 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 13 Mar 2010 16:27:27 +0000 Subject: [PATCH 030/313] Upgraded Apache Tomcat to 6.0.26 svn path=/nixpkgs/trunk/; revision=20606 --- pkgs/servers/http/tomcat/6.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix index 4fe906bedd0..256612f94fc 100644 --- a/pkgs/servers/http/tomcat/6.0.nix +++ b/pkgs/servers/http/tomcat/6.0.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { - name = "apache-tomcat-6.0.20"; + name = "apache-tomcat-6.0.26"; builder = ./builder-6.0.sh; src = fetchurl { - url = http://apache.mirrors.webazilla.nl/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20.tar.gz; - sha256 = "0vh48rvbynawivqm3hs7453527g8qns9kcj7vmihjpf21mrc2hx4"; + url = http://apache.proserve.nl/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.tar.gz; + sha256 = "0rxaz7wkw6xas9f2jslb6kp1prllhpqmq7c3h0ig19j146mrjbls"; }; inherit jdk; From 2a24a1f3a48ed59e9b141e31f8aee9e5379cbbeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 13 Mar 2010 18:19:31 +0000 Subject: [PATCH 031/313] Coccinelle: Fix test-suite runs. svn path=/nixpkgs/trunk/; revision=20608 --- pkgs/development/tools/misc/coccinelle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 962d2dad3d3..d8b077a20f5 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --prefix "LD_LIBRARY_PATH" ":" "$out/lib" \ --prefix "PYTHONPATH" ":" "$out/share/coccinelle/python" - make test + yes | make test ''; meta = { From 71bf44450421940f8eff188bfca3c0fffc576f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 14 Mar 2010 14:05:04 +0000 Subject: [PATCH 032/313] Updating uclibc (This new release fixed a problem in ._start that gave me a lot of headache in mips) svn path=/nixpkgs/trunk/; revision=20613 --- pkgs/os-specific/linux/uclibc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 278db745d60..83de2ae38ef 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -23,12 +23,12 @@ let crossMakeFlag = if (cross != null) then "CROSS=${cross.config}-" else ""; in stdenv.mkDerivation { - name = "uclibc-0.9.30.2" + stdenv.lib.optionalString (cross != null) + name = "uclibc-0.9.30.3" + stdenv.lib.optionalString (cross != null) ("-" + cross.config); src = fetchurl { - url = http://www.uclibc.org/downloads/uClibc-0.9.30.2.tar.bz2; - sha256 = "0wr4hlybssiyswdc73wdcxr31xfbss3lnqiv5lcav3rg3v4r4vmb"; + url = http://www.uclibc.org/downloads/uClibc-0.9.30.3.tar.bz2; + sha256 = "0f1fpdwampbw7pf79i64ipj0azk4kbc9wl81ynlp19p92k4klz0h"; }; configurePhase = '' From 9b1d5353a951a29e33a3a137cb3d5246c1eff6a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 14 Mar 2010 14:05:08 +0000 Subject: [PATCH 033/313] Making the gcc cross-compiler a bit more flexible. svn path=/nixpkgs/trunk/; revision=20614 --- pkgs/development/compilers/gcc-4.4/default.nix | 18 ++++++++++++++---- pkgs/top-level/release-cross.nix | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index 358e5212407..85a3aee4c89 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -57,24 +57,34 @@ let version = "4.4.3"; javaAwtGtk = langJava && gtk != null; - withCPU = if cross ? cpu then " --with-cpu=${cross.cpu}" else ""; + /* Cross-gcc settings */ + gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross; + gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross; + gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross; + withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; + withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; + withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; crossConfigureFlags = "--target=${cross.config}" + - withCPU + + withArch + + withCpu + + withAbi + (if crossStageStatic then " --disable-libssp --disable-nls" + " --without-headers" + " --disable-threads " + " --disable-libmudflap " + " --disable-libgomp " + - " --disable-shared" + " --disable-shared" + + " --disable-decimal-float" # libdecnumber requires libc else " --with-headers=${libcCross}/include" + " --enable-__cxa_atexit" + " --enable-long-long" + " --enable-threads=posix" + - " --enable-nls" + " --enable-nls" + + " --disable-decimal-float" # No final libdecnumber (it may work only in 386) ); stageNameAddon = if (crossStageStatic) then "-stage-static" else "-stage-final"; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 37ecda0e027..571484f0540 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -105,7 +105,6 @@ let arch = "sparc64"; float = "hard"; withTLS = true; - cpu = "ultrasparc"; libc = "glibc"; platform = { name = "ultrasparc"; @@ -118,6 +117,7 @@ let uboot = null; }; openssl.system = "linux64-sparcv9"; + gcc.cpu = "ultrasparc"; }; in { crossUltraSparcLinux = mapTestOnCross crossSystem basic; From 182aa30e55eac2c7a7d9659829f215e6a91d96ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 14 Mar 2010 21:17:17 +0000 Subject: [PATCH 034/313] Making the sheevaplug kernel include DM_CRYPT and the cryptoloop device. svn path=/nixpkgs/trunk/; revision=20618 --- pkgs/top-level/platforms.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index eb2943f8c70..6ac865ea8d8 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -35,7 +35,9 @@ rec { '' BLK_DEV_RAM y BLK_DEV_INITRD y + BLK_DEV_CRYPTOLOOP m BLK_DEV_DM m + DM_CRYPT m MD y REISERFS_FS m EXT4_FS m From 295d24927432c46e7ef55832617a258c8387b21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 14 Mar 2010 22:11:36 +0000 Subject: [PATCH 035/313] Try building `gitFull'. svn path=/nixpkgs/trunk/; revision=20621 --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 7c5623a8991..93b25598622 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -102,7 +102,7 @@ with (import ./release-lib.nix); ghostscriptX = linux; gimp = linux; git = linux; - #gitFull = linux; + gitFull = linux; glibc = linux; glibcLocales = linux; glxinfo = linux; From eb083a3999de866133bbf50522e98c3d816066e0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Mar 2010 10:02:24 +0000 Subject: [PATCH 036/313] * Increase `max_print_line' to prevent TeX from breaking lines at 79 characters, which is stupid. (For instance, it breaks grepping for words when they are broken across multiple lines.) * Print warnings in the condensed log output. svn path=/nixpkgs/trunk/; revision=20625 --- pkgs/misc/tex/nix/run-latex.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/misc/tex/nix/run-latex.sh b/pkgs/misc/tex/nix/run-latex.sh index ecce893950b..1db41f3c336 100644 --- a/pkgs/misc/tex/nix/run-latex.sh +++ b/pkgs/misc/tex/nix/run-latex.sh @@ -2,6 +2,9 @@ source $stdenv/setup ensureDir $out +export TEXMFCNF=$TMPDIR: +echo 'max_print_line = 8192' >> $TMPDIR/texmf.cnf + mkdir root cd root @@ -125,6 +128,10 @@ else fi +echo "WARNINGS:" +cat $tmpFile | grep "Warning:" | grep -v "Citation.*undefined" || true + +echo echo "OVERFULL/UNDERFULL:" cat $tmpFile | egrep "Overfull|Underfull" || true From d44be49320fec5e19b4860333dec4f14a1c52a3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 15 Mar 2010 14:26:47 +0000 Subject: [PATCH 037/313] Updating tkcvs (which includes tkdiff) svn path=/nixpkgs/trunk/; revision=20632 --- pkgs/applications/version-management/tkcvs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix index a21501dccad..569c442f983 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "tkcvs-8.2"; + name = "tkcvs-8.2.1"; src = fetchurl { - url = mirror://sourceforge/tkcvs/tkcvs_8_2.tar.gz; - sha256 = "0cr2f8jd6k2h1n8mvfv6frrfv4kxd7k3mhplk3ghl6hrgklr7ywr"; + url = mirror://sourceforge/tkcvs/tkcvs_8_2_1.tar.gz; + sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i"; }; buildInputs = [ tcl tk ]; From f68b2277b7d2f79adf6872a8461961b81f250af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 15 Mar 2010 14:26:52 +0000 Subject: [PATCH 038/313] Adding qshowdiff. svn path=/nixpkgs/trunk/; revision=20633 --- pkgs/tools/text/qshowdiff/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/text/qshowdiff/default.nix diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix new file mode 100644 index 00000000000..ee87bffc672 --- /dev/null +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, qt, perl}: + +stdenv.mkDerivation rec { + name = "qshowdiff-1.2"; + + src = fetchurl { + url = http://qshowdiff.danfis.cz/files/qshowdiff-1.2.tar.gz; + sha256 = "0i3ssvax4xync9c53jaxribazvh8d8v148l3yiqsfjmqsggw9rh3"; + }; + + buildInputs = [ qt perl ]; + + configurePhase = '' + ensureDir $out/{bin,man/man1} + makeFlags="PREFIX=$out" + ''; + + meta = { + homepage = http://qshowdiff.danfis.cz/; + description = "Colourful diff viewer"; + license = "GPLv3+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37c6e5238b1..f245eb59dc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1422,6 +1422,11 @@ let inherit stdenv fetchurl; }; + qshowdiff = import ../tools/text/qshowdiff { + inherit fetchurl stdenv perl; + qt = qt4; + }; + reiser4progs = import ../tools/filesystems/reiser4progs { inherit fetchurl stdenv libaal; }; From 2ce4840754850ff57dfb69392fb29f61fec0e743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 15 Mar 2010 14:26:58 +0000 Subject: [PATCH 039/313] Adding kdiff3 as extragear. I don't know if 'extragear' involves a specific list of packages. (Thanks to Stephen for a patch) svn path=/nixpkgs/trunk/; revision=20634 --- pkgs/desktops/kde-4.4/default.nix | 6 ++++++ pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix | 14 ++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index e3eb9ba7af5..775239376d8 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -237,6 +237,12 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon; }; + kdiff3 = import ./extragear/kdiff3 { + inherit (pkgs) stdenv fetchurl cmake qt4 gettext perl; + inherit kdelibs kdebase; + inherit automoc4 phonon; + }; + kipiplugins = import ./extragear/kipi-plugins { inherit (pkgs) stdenv fetchurl lib cmake qt4 libxml2 libxslt gettext; inherit kdelibs kdepimlibs kdegraphics; diff --git a/pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix b/pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix new file mode 100644 index 00000000000..d53fdbaf2e6 --- /dev/null +++ b/pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, cmake, qt4, perl, kdelibs, kdebase, automoc4, phonon, gettext}: + +stdenv.mkDerivation { + name = "kdiff3-0.9.95"; + src = fetchurl { + url = http://downloads.sourceforge.net/project/kdiff3/kdiff3/0.9.95/kdiff3-0.9.95.tar.gz; + sha256 = "0372cebc8957f256a98501a4ac3c3634c7ecffb486ece7e7819c90d876202f0f"; + }; + + cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; + + # kdebase allows having a konqueror plugin built + buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon gettext kdebase ]; +} From f05adf46bd7214cab91cbb617189934810c4772e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 16 Mar 2010 06:44:02 +0000 Subject: [PATCH 040/313] Make FlashPlayer9 build for now.. svn path=/nixpkgs/trunk/; revision=20641 --- .../mozilla-plugins/flashplayer-9/builder.sh | 2 ++ .../mozilla-plugins/flashplayer-9/default.nix | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh index 8a0cc3c94fe..0f738eb9ccc 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh @@ -3,6 +3,8 @@ source $stdenv/setup dontStrip=1 dontPatchELF=1 +sourceRoot=. + installPhase() { ensureDir $out/lib/mozilla/plugins cp -p libflashplayer.so $out/lib/mozilla/plugins diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix index 899d9fb48d2..913aa985583 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix @@ -15,6 +15,8 @@ , glib , pango , atk + +, customSrc ? null }: assert stdenv.system == "i686-linux"; @@ -23,10 +25,12 @@ stdenv.mkDerivation { name = "flashplayer-9.0.124.0"; builder = ./builder.sh; - src = fetchurl { - url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz; - sha256 = "16p98jf3y9041p8fk6cq7dqj7s4l4m7g9nhvc3dmhmld0075qagl"; - }; + src = if customSrc == null then + fetchurl { + url = http://download.macromedia.com/pub/flashplayer/installers/current/9/install_flash_player_9.tar.gz; + sha256 = "1cnsjgmy7rwj3spzb5mmpmvzxjp435jisl0dd8s4rf4xskyy6d6r"; + } + else customSrc; inherit zlib alsaLib; @@ -40,5 +44,4 @@ stdenv.mkDerivation { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; }; - } From 891bf14096f8b94919c8292b041927683235a96b Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 16 Mar 2010 09:12:26 +0000 Subject: [PATCH 041/313] also make python 26 default on darwin svn path=/nixpkgs/trunk/; revision=20642 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f245eb59dc4..966b6f062ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2621,8 +2621,8 @@ let python = if getConfig ["python" "full"] false then pythonFull else pythonBase; python25 = if getConfig ["python" "full"] false then python25Full else python25Base; python26 = if getConfig ["python" "full"] false then python26Full else python26Base; - pythonBase = if stdenv.isDarwin then python25Base else python26Base; - pythonFull = if stdenv.isDarwin then python25Full else python26Full; + pythonBase = python26Base; + pythonFull = python26Full; python24 = import ../development/interpreters/python/2.4 { inherit fetchurl stdenv zlib bzip2; From 541beebe6fae88f188ccfd6632dd3abfc2756fd8 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 16 Mar 2010 10:37:41 +0000 Subject: [PATCH 042/313] libncurses: on darwin systems remove .so files svn path=/nixpkgs/trunk/; revision=20644 --- pkgs/development/libraries/ncurses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 2e6de49958e..5a8e91f8a35 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unicode ? true}: -stdenv.mkDerivation rec { +stdenv.mkDerivation ( rec { name = "ncurses-5.7"; src = fetchurl { @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { license = "X11"; }; -} +} // ( if stdenv.isDarwin then { postFixup = "rm $out/lib/*.so"; } else {} ) ) From 0ef1853275828c0fa265029e6d1bcf8746f4fa40 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 16 Mar 2010 10:52:12 +0000 Subject: [PATCH 043/313] because i was too lazy, now the real reason: if I don't do this, mercurial fails to run on darwin svn path=/nixpkgs/trunk/; revision=20645 --- pkgs/development/libraries/ncurses/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 5a8e91f8a35..344db123801 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -53,4 +53,4 @@ stdenv.mkDerivation ( rec { license = "X11"; }; -} // ( if stdenv.isDarwin then { postFixup = "rm $out/lib/*.so"; } else {} ) ) +} // ( if stdenv.isDarwin then { postFixup = "rm $out/lib/*.so"; } else { } ) ) From f02cd9d59c0499bd8b56d55e6140a1b7a70728c9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Mar 2010 11:44:28 +0000 Subject: [PATCH 044/313] * Linux updated to 2.6.32.10, 2.6.33.1. svn path=/nixpkgs/trunk/; revision=20646 --- pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-2.6.33.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index 57f399116e4..91c4c1e904c 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -199,11 +199,11 @@ in import ./generic.nix ( rec { - version = "2.6.32.9"; + version = "2.6.32.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1g6hs7j5kmifb3phbnckdmrnxd0cpqrijnnbry86z26npsh9my7l"; + sha256 = "04d8rwvpv0hy0il3wzk2yc7ah72jkdxnym7h7k3ib0csjhfvh2y9"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.33.nix b/pkgs/os-specific/linux/kernel/linux-2.6.33.nix index acc1f67380a..fb763a2b266 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.33.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.33.nix @@ -197,11 +197,11 @@ in import ./generic.nix ( rec { - version = "2.6.33"; + version = "2.6.33.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1inmam21w13nyf5imgdb5palhiap41zcxf9k32i4ck1w7gg3gqk3"; + sha256 = "1c9fnhmjg5vbixxqcbb8648x3asgmxgh5m25zla4417b3dfawqc0"; }; config = configWithPlatform stdenv.platform; From f92867651f42adec9ffc3bacba4bd4beefeee417 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Mar 2010 12:13:32 +0000 Subject: [PATCH 045/313] pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.0.2 svn path=/nixpkgs/trunk/; revision=20649 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 8d4fb7aad74..334b72cea06 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,11 +10,11 @@ assert svnSupport -> (subversion != null && perlLibs != [] && subversion.perlBindings); stdenv.mkDerivation rec { - name = "git-1.7.0"; + name = "git-1.7.0.2"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "a61e863944381c4f8231841f678f41f56b634bebca486a61005b35e5bcbb7c79"; + sha256 = "0bvb3ankwjqlvs3ibw1q0k2wyzdp9rlq5clnw5nxdzc2q9zxy0an"; }; patches = [ ./docbook2texi.patch ]; From b6d6f301c4a72e37e9ace8532bedfdf7ebb2eed8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Mar 2010 12:13:40 +0000 Subject: [PATCH 046/313] pkgs/applications/editors/emacs-modes/magit: updated to version magit-0.7-94-gbf42bf8 Magit has seen plenty of development since version 0.7, but for some reason there haven't been any new releases. This version bump updates the expression to build a current version of Magit directly from the Git repository. This change adds buildInputs 'autoconf' and 'automake'. These tools are required only because we aren't building from a proper release tarball. Once version 0.8 comes out, these dependencies can be dropped again. svn path=/nixpkgs/trunk/; revision=20650 --- .../editors/emacs-modes/magit/default.nix | 12 ++++++---- pkgs/top-level/all-packages.nix | 24 +++++++++---------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index de555632f52..bd27ed8aa36 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,14 +1,16 @@ -{stdenv, fetchurl, emacs, texinfo}: +{stdenv, fetchurl, emacs, texinfo, autoconf, automake}: stdenv.mkDerivation { - name = "magit-0.7"; + name = "magit-0.7-94-gbf42bf8"; src = fetchurl { - url = "http://zagadka.vm.bytemark.co.uk/magit/magit-0.7.tar.gz"; - sha256 = "0qry1vj41pycwkf71sqrz3zgzh85zdg5acq26asscq4s7jksrjiz"; + url = "http://gitorious.org/magit/mainline/archive-tarball/magit_0.7-94-gbf42bf8"; + sha256 = "6543a4e312d1a4249ff1edd192914d02f1a9016c321c8fdd0f015074e522759a"; }; + unpackCmd = "tar xf $src"; + preConfigure = "./autogen.sh"; - buildInputs = [emacs texinfo]; + buildInputs = [emacs texinfo autoconf automake]; meta = { description = "An an interface to Git, implemented as an extension to Emacs."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 966b6f062ba..85b5d16c3e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3808,14 +3808,14 @@ let inherit fetchurl stdenv; }; - gmp = + gmp = if stdenv.system == "i686-darwin" then # GMP 4.3.2 is broken on Darwin, so use 4.3.1. makeOverridable (import ../development/libraries/gmp/4.3.1.nix) { inherit stdenv fetchurl m4; cxx = false; } - else + else makeOverridable (import ../development/libraries/gmp) { inherit stdenv fetchurl m4; cxx = false; @@ -4450,7 +4450,7 @@ let inherit fetchurl stdenv pkgconfig; inherit (xlibs) libX11 libxcb xcbutil; }; - + libtasn1 = import ../development/libraries/libtasn1 { inherit fetchurl stdenv; }; @@ -4883,17 +4883,17 @@ let librdf_raptor = import ../development/libraries/librdf/raptor.nix { inherit fetchurl stdenv lib libxml2 curl; }; - + librdf_rasqal = import ../development/libraries/librdf/rasqal.nix { inherit fetchurl stdenv lib pcre libxml2 gmp librdf_raptor; }; - + librdf = import ../development/libraries/librdf { inherit fetchurl stdenv lib pkgconfig librdf_raptor ladspaH openssl zlib; }; redland = redland_1_0_10; - + redland_1_0_8 = makeOverridable (import ../development/libraries/redland/1.0.8.nix) { inherit fetchurl stdenv openssl libxml2 pkgconfig perl sqlite libxslt curl pcre librdf_rasqal librdf_raptor; @@ -6616,7 +6616,7 @@ let inherit fetchurl stdenv pkgconfig gettext intltool perl perlXMLParser libxml2 glib; }; - + shared_desktop_ontologies = import ../data/misc/shared-desktop-ontologies { inherit stdenv fetchurl cmake; }; @@ -7050,7 +7050,7 @@ let dmtx = builderDefsPackage (import ../tools/graphics/dmtx) { inherit libpng libtiff libjpeg imagemagick librsvg - pkgconfig bzip2 zlib libtool freetype fontconfig + pkgconfig bzip2 zlib libtool freetype fontconfig ghostscript; inherit (xlibs) libX11; }; @@ -7174,7 +7174,7 @@ let }; magit = import ../applications/editors/emacs-modes/magit { - inherit fetchurl stdenv emacs texinfo; + inherit fetchurl stdenv emacs texinfo autoconf automake; }; maudeMode = import ../applications/editors/emacs-modes/maude { @@ -8753,13 +8753,13 @@ let }; kde4 = kde43; - + kde43 = makeOverridable (import ../desktops/kde-4.3) (pkgs // { openexr = openexr_1_6_1; qt4 = qt45; popplerQt4 = popplerQt45; }); - + kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // { openexr = openexr_1_6_1; qt4 = qt46; @@ -8767,7 +8767,7 @@ let sip = sip410; pyqt4 = pyqt47; }); - + kdelibs = kde3.kdelibs; kdebase = kde3.kdebase; From 8ff6ffbb65289d506b2d2d43f706549768d739d6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Mar 2010 12:46:12 +0000 Subject: [PATCH 047/313] * Update the unstable Nix (with some GC-related bug fixes). svn path=/nixpkgs/trunk/; revision=20652 --- .../tools/package-management/nix/unstable.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 81a8b56963a..574b223ce06 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -4,21 +4,22 @@ }: stdenv.mkDerivation rec { - name = "nix-0.15pre20560"; + name = "nix-0.15pre20612"; src = fetchurl { - url = "http://hydra.nixos.org/build/322259/download/4/${name}.tar.bz2"; - sha256 = "16sjb8bdknzjqwhwlcxx1jwq3lij2lvz6vda3w1b6pjhhhclj58f"; + url = "http://hydra.nixos.org/build/325045/download/4/${name}.tar.bz2"; + sha256 = "a0fecb2d9cced473880649d7ee6448688d63416fb2e26bdbadec069e5b619bce"; }; - buildNativeInputs = [perl]; - buildInputs = [curl openssl]; + buildNativeInputs = [ perl ]; + buildInputs = [ curl openssl ]; - configureFlags = '' - --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-aterm=${aterm} --with-bzip2=${bzip2} - --disable-init-state - ''; + configureFlags = + '' + --with-store-dir=${storeDir} --localstatedir=${stateDir} + --with-aterm=${aterm} --with-bzip2=${bzip2} + --disable-init-state + ''; doCheck = true; From cab868b9a3438f47c3fc370a1352cc3301be125e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Mar 2010 12:51:45 +0000 Subject: [PATCH 048/313] pkgs/applications/editors/emacs-modes/magit: download tarball from cryp.to The idea of downloading the source code tarball directly from gitorious.org was great, but didn't work. Apparently, those tarballs have different checksums every time they're generated. To remedy the situation, I've copied the proper tarball statically to . svn path=/nixpkgs/trunk/; revision=20653 --- pkgs/applications/editors/emacs-modes/magit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index bd27ed8aa36..ec7e1123128 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "magit-0.7-94-gbf42bf8"; src = fetchurl { - url = "http://gitorious.org/magit/mainline/archive-tarball/magit_0.7-94-gbf42bf8"; - sha256 = "6543a4e312d1a4249ff1edd192914d02f1a9016c321c8fdd0f015074e522759a"; + url = "http://cryp.to/magit-mainline-0.7-94-gbf42bf8.tar.gz"; + sha256 = "16km4bjp8l011zfqy71jdh0skw829n8r5lgdy6gj996i2bis8hv5"; }; unpackCmd = "tar xf $src"; preConfigure = "./autogen.sh"; From d1217f68a43e9cfd723eb92754a3eb2058542547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 16 Mar 2010 18:57:17 +0000 Subject: [PATCH 049/313] Reverting eelco's r20469, which was applied due to a misunderstanding with an hydra build. kde44 has worked well enough then and since then. svn path=/nixpkgs/trunk/; revision=20668 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85b5d16c3e2..06144d89914 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8752,7 +8752,7 @@ let }; - kde4 = kde43; + kde4 = kde44; kde43 = makeOverridable (import ../desktops/kde-4.3) (pkgs // { openexr = openexr_1_6_1; From dd4ad6741e579c39903acaa03c5a9c7cfbc25d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 16 Mar 2010 20:49:26 +0000 Subject: [PATCH 050/313] Fixing once again the ld-wrapper.sh script. I put it in a gcc-wrapper apart, to be removed on the next stdenv-updates. This would fix the build for many cmake packages, although that requires updating the stdenv in those for its gcc to use this 2nd wrapper. I updated paraview and avidemux. I can't recall now more packages with problems, but I was quite sure there were. If anyone sees a cmake-built package with the result binaries lacking some rpaths, then try this wrapper. svn path=/nixpkgs/trunk/; revision=20669 --- pkgs/build-support/gcc-wrapper/default2.nix | 72 +++++++++ pkgs/build-support/gcc-wrapper/ld-wrapper2.sh | 153 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 12 +- 3 files changed, 235 insertions(+), 2 deletions(-) create mode 100644 pkgs/build-support/gcc-wrapper/default2.nix create mode 100644 pkgs/build-support/gcc-wrapper/ld-wrapper2.sh diff --git a/pkgs/build-support/gcc-wrapper/default2.nix b/pkgs/build-support/gcc-wrapper/default2.nix new file mode 100644 index 00000000000..efade01963b --- /dev/null +++ b/pkgs/build-support/gcc-wrapper/default2.nix @@ -0,0 +1,72 @@ +# The Nix `gcc' stdenv.mkDerivation is not directly usable, since it doesn't +# know where the C library and standard header files are. Therefore +# the compiler produced by that package cannot be installed directly +# in a user environment and used from the command line. This +# stdenv.mkDerivation provides a wrapper that sets up the right environment +# variables so that the compiler and the linker just "work". + +{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? "" +, gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? "" +, zlib ? null +}: + +assert nativeTools -> nativePrefix != ""; +assert !nativeTools -> gcc != null && binutils != null && coreutils != null; +assert !nativeLibc -> libc != null; + +# For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper +assert (gcc != null && gcc ? langVhdl && gcc.langVhdl) -> zlib != null; + +let + + gccVersion = (builtins.parseDrvName gcc.name).version; + gccName = (builtins.parseDrvName gcc.name).name; + +in + +stdenv.mkDerivation { + name = + (if name != "" then name else gccName + "-wrapper") + + (if gcc != null && gccVersion != "" then "-" + gccVersion else ""); + + builder = ./builder.sh; + setupHook = ./setup-hook.sh; + gccWrapper = ./gcc-wrapper.sh; + gnatWrapper = ./gnat-wrapper.sh; + gnatlinkWrapper = ./gnatlink-wrapper.sh; + ldWrapper = ./ld-wrapper2.sh; + utils = ./utils.sh; + addFlags = ./add-flags; + + inherit nativeTools nativeLibc nativePrefix gcc; + libc = if nativeLibc then null else libc; + binutils = if nativeTools then null else binutils; + # The wrapper scripts use 'cat', so we may need coreutils + coreutils = if nativeTools then null else coreutils; + + langC = if nativeTools then true else gcc.langC; + langCC = if nativeTools then true else gcc.langCC; + langFortran = if nativeTools then false else gcc ? langFortran; + langAda = if nativeTools then false else gcc ? langAda && gcc.langAda; + langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl; + zlib = if (gcc != null && gcc ? langVhdl) then zlib else null; + shell = if shell == "" then stdenv.shell else shell; + + meta = + let gcc_ = if gcc != null then gcc else {}; in + (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) // + { description = + stdenv.lib.attrByPath ["meta" "description"] "System C compiler" gcc_ + + " (wrapper script)"; + }; + + # The dynamic linker has different names on different Linux platforms. + dynamicLinker = + if !nativeLibc then + (if stdenv.system == "i686-linux" then "ld-linux.so.2" else + if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else + if stdenv.system == "armv5tel-linux" then "ld-linux.so.3" else + if stdenv.system == "powerpc-linux" then "ld.so.1" else + abort "don't know the name of the dynamic linker for this platform") + else ""; +} diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper2.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper2.sh new file mode 100644 index 00000000000..0e39dde0b01 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper/ld-wrapper2.sh @@ -0,0 +1,153 @@ +#! @shell@ -e + +if test -n "$NIX_LD_WRAPPER_START_HOOK"; then + source "$NIX_LD_WRAPPER_START_HOOK" +fi + +if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then + source @out@/nix-support/add-flags.sh +fi + +source @out@/nix-support/utils.sh + + +# Optionally filter out paths not refering to the store. +params=("$@") +if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \ + -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \); then + rest=() + n=0 + while test $n -lt ${#params[*]}; do + p=${params[n]} + p2=${params[$((n+1))]} + if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then + skip $p + elif test "$p" = "-L" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "$p" = "-rpath" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "$p" = "-dynamic-linker" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "${p:0:1}" = "/" && badPath "$p"; then + # We cannot skip this; barf. + echo "impure path \`$p' used in link" >&2 + exit 1 + else + rest=("${rest[@]}" "$p") + fi + n=$((n + 1)) + done + params=("${rest[@]}") +fi + + +extra=() +extraBefore=() + +if test -z "$NIX_LDFLAGS_SET"; then + extra=(${extra[@]} $NIX_LDFLAGS) + extraBefore=(${extraBefore[@]} $NIX_LDFLAGS_BEFORE) +fi + + +# Add all used dynamic libraries to the rpath. +if test "$NIX_DONT_SET_RPATH" != "1"; then + + libPath="" + addToLibPath() { + local path="$1" + if test "${path:0:1}" != "/"; then return 0; fi + case "$path" in + *..*|*./*|*/.*|*//*) + local path2 + if path2=$(readlink -f "$path"); then + path="$path2" + fi + ;; + esac + case $libPath in + *\ $path\ *) return 0 ;; + esac + libPath="$libPath $path " + } + + addToRPath() { + # If the path is not in the store, don't add it to the rpath. + # This typically happens for libraries in /tmp that are later + # copied to $out/lib. If not, we're screwed. + if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi + case $rpath in + *\ $1\ *) return 0 ;; + esac + rpath="$rpath $1 " + } + + rpath="" + + # First, find all -L... switches. + allParams=("${params[@]}" ${extra[@]}) + n=0 + while test $n -lt ${#allParams[*]}; do + p=${allParams[n]} + p2=${allParams[$((n+1))]} + if test "${p:0:3}" = "-L/"; then + addToLibPath ${p:2} + elif test "$p" = "-L"; then + addToLibPath ${p2} + n=$((n + 1)) + elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then + # This is a direct reference to a shared library, so add + # its directory to the rpath. + path="$(dirname "$p")"; + addToRPath "${path}" + fi + n=$((n + 1)) + done + + # Second, for each directory in the library search path (-L...), + # see if it contains a dynamic library used by a -l... flag. If + # so, add the directory to the rpath. + + for i in $libPath; do + n=0 + while test $n -lt ${#allParams[*]}; do + p=${allParams[n]} + p2=${allParams[$((n+1))]} + if test "${p:0:2}" = "-l" -a -f "$i/lib${p:2}.so"; then + addToRPath $i + break + elif test "$p" = "-l" -a -f "$i/lib${p2}"; then + # I haven't seen `-l foo', but you never know... + addToRPath $i + break + fi + n=$((n + 1)) + done + + done + + + # Finally, add `-rpath' switches. + for i in $rpath; do + extra=(${extra[@]} -rpath $i) + done +fi + + +# Optionally print debug info. +if test "$NIX_DEBUG" = "1"; then + echo "original flags to @ld@:" >&2 + for i in "${params[@]}"; do + echo " $i" >&2 + done + echo "extra flags to @ld@:" >&2 + for i in ${extra[@]}; do + echo " $i" >&2 + done +fi + +if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then + source "$NIX_LD_WRAPPER_EXEC_HOOK" +fi + +exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06144d89914..11051aef849 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2466,6 +2466,12 @@ let }; wrapGCC = wrapGCCWith (import ../build-support/gcc-wrapper) glibc; + # To be removed on stdenv-updates + # By now this has at least the fix of setting the proper rpath when a file "libbla.so" + # is passed directly to the linker. + # This is of interest to programs built by cmake, because this is a common practice + # in cmake builds. + wrapGCC2 = wrapGCCWith (import ../build-support/gcc-wrapper/default2.nix) glibc; wrapGCCCross = {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}: @@ -6769,10 +6775,11 @@ let }; avidemux = import ../applications/video/avidemux { - inherit fetchurl stdenv cmake pkgconfig libxml2 qt4 gettext SDL libxslt x264 + inherit fetchurl cmake pkgconfig libxml2 qt4 gettext SDL libxslt x264 alsaLib lame faac faad2 libvorbis; inherit (gtkLibs) gtk; inherit (xlibs) libXv pixman libpthreadstubs libXau libXdmcp; + stdenv = overrideGCC stdenv (wrapGCC2 gcc.gcc); }; awesome = import ../applications/window-managers/awesome { @@ -7900,7 +7907,8 @@ let }; paraview = import ../applications/graphics/paraview { - inherit fetchurl stdenv cmake qt4; + inherit fetchurl cmake qt4; + stdenv = overrideGCC stdenv (wrapGCC2 gcc.gcc); }; partitionManager = import ../tools/misc/partition-manager { From 1d71fc89232c66a2c31edda34ae665dd7d6c86af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 16 Mar 2010 21:52:36 +0000 Subject: [PATCH 051/313] Updating avidemux svn path=/nixpkgs/trunk/; revision=20670 --- pkgs/applications/video/avidemux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 8ff345d5ea9..4aaf2ef9cc1 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -5,11 +5,11 @@ alsaLib, lame, faac, faad2, libvorbis }: assert stdenv ? glibc; stdenv.mkDerivation { - name = "avidemux-2.5.1"; + name = "avidemux-2.5.2"; src = fetchurl { - url = mirror://sourceforge/avidemux/avidemux_2.5.1.tar.gz; - sha256 = "14jwrblbli7bswx4i7b85l0s1msx8rxrqb908df3z8jxm6w4cm9g"; + url = mirror://sourceforge/avidemux/avidemux_2.5.2.tar.gz; + sha256 = "1apq5s79ik562xmhyvg6nvkmk2bhm5fcjwsrwrpxwipn6swkfpk8"; }; buildInputs = [ cmake pkgconfig libxml2 qt4 gtk gettext SDL libXv From 23809aa68101f49b6b5c3c99e712e1debde70a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 16 Mar 2010 21:53:48 +0000 Subject: [PATCH 052/313] Trying to fix the nixpkgs-tarball, after I broke it again due to assuming 'gcc' to be pure as that of stdenvLinux. svn path=/nixpkgs/trunk/; revision=20671 --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11051aef849..f8a55f8d535 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2466,12 +2466,14 @@ let }; wrapGCC = wrapGCCWith (import ../build-support/gcc-wrapper) glibc; + # To be removed on stdenv-updates # By now this has at least the fix of setting the proper rpath when a file "libbla.so" # is passed directly to the linker. # This is of interest to programs built by cmake, because this is a common practice # in cmake builds. wrapGCC2 = wrapGCCWith (import ../build-support/gcc-wrapper/default2.nix) glibc; + stdenv2 = if (gcc.nativeTools) then stdenv else (overrideGCC stdenv (wrapGCC2 gcc.gcc)); wrapGCCCross = {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}: @@ -6779,7 +6781,7 @@ let alsaLib lame faac faad2 libvorbis; inherit (gtkLibs) gtk; inherit (xlibs) libXv pixman libpthreadstubs libXau libXdmcp; - stdenv = overrideGCC stdenv (wrapGCC2 gcc.gcc); + stdenv = stdenv2; }; awesome = import ../applications/window-managers/awesome { @@ -7908,7 +7910,7 @@ let paraview = import ../applications/graphics/paraview { inherit fetchurl cmake qt4; - stdenv = overrideGCC stdenv (wrapGCC2 gcc.gcc); + stdenv = stdenv2; }; partitionManager = import ../tools/misc/partition-manager { From 19f0cd20fd92423497056a28362344bf6f79f3d6 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 16 Mar 2010 23:34:56 +0000 Subject: [PATCH 053/313] HaXe: support nekotools boot - add haxelib svn path=/nixpkgs/trunk/; revision=20674 --- pkgs/development/compilers/haxe/default.nix | 140 +++++++++++++------- pkgs/development/compilers/neko/default.nix | 18 ++- pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 112 insertions(+), 52 deletions(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 0f1aeddf64b..72c423cbcd8 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -37,55 +37,103 @@ let # END }.src; + src_haxe = { + # REGION AUTO UPDATE: { name="haxe"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "haxe"; groups = "haxe_group"; } + src= sourceFromHead "haxe-F_01-25-35.tar.gz" + (fetchurl { url = "http://mawercer.de/~nix/repos/haxe-F_01-25-35.tar.gz"; sha256 = "8e5e5330e2fd7ffbbfe48d40bda03256aefbe30cf1be1d9c9065117b2b179f24"; }); + # END + }.src; + + + # the HaXe compiler + haxe = stdenv.mkDerivation { + name = "haxe-cvs"; + + buildInputs = [ocaml zlib makeWrapper]; + + src = src_haxe; + + inherit zlib; + + buildPhase = '' + mkdir -p ocaml/{swflib,extc,extlib-dev,xml-light} neko/libs + + # strange setup. install.ml seems to co the same repo again into haxe directory! + tar xfz $src --strip-components=1 -C haxe + + t(){ tar xfz $1 -C $2 --strip-components=2; } + t ${src_haxe_swflib} ocaml/swflib + t ${src_haxe_extc} ocaml/extc + t ${src_haxe_extlib_dev} ocaml/extlib-dev + t ${src_haxe_xml_light} ocaml/xml-light + t ${src_haxe_neko_include} neko/libs + + sed -e '/download();/d' \ + -e "s@/usr/lib/@''${zlib}/lib/@g" \ + doc/install.ml > install.ml + + ocaml install.ml + ''; + + # probably rpath should be set properly + installPhase = '' + ensureDir $out/lib/haxe + cp -r bin $out/bin + wrapProgram "$out/bin/haxe" \ + --set "LD_LIBRARY_PATH" $zlib/lib \ + --set HAXE_LIBRARY_PATH "''${HAXE_LIBRARY_PATH}''${HAXE_LIBRARY_PATH:-:}:$out/lib/haxe/std:." + cp -r std $out/lib/haxe/ + ''; + + meta = { + description = "programming language targeting JavaScript, Flash, NekVM, PHP, C++"; + homepage = http://haxe.org; + license = ["GPLv2" "BSD2" /*?*/ ]; # -> docs/license.txt + maintainers = [args.lib.maintainers.marcweber]; + platforms = args.lib.platforms.linux; + }; + }; + + # build a tool found in std/tools/${name} source directory + # the .hxml files contain a recipe to cerate a binary. + tool = { name, description }: stdenv.mkDerivation { + + inherit name; + + src = src_haxe; + + buildPhase = '' + cd std/tools/${name}; + haxe *.hxml + ensureDir $out/bin + mv ${name} $out/bin/ + ''; + + buildInputs = [haxe neko]; + + dontStrip=1; + + installPhase=":"; + + meta = { + inherit description; + homepage = http://haxe.org; + # license = "?"; TODO + maintainers = [args.lib.maintainers.marcweber]; + platforms = args.lib.platforms.linux; + }; + + }; + in -stdenv.mkDerivation { - name = "haxe-cvs"; +{ - # REGION AUTO UPDATE: { name="haxe"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "haxe"; groups = "haxe_group"; } - src= sourceFromHead "haxe-F_01-25-35.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/haxe-F_01-25-35.tar.gz"; sha256 = "8e5e5330e2fd7ffbbfe48d40bda03256aefbe30cf1be1d9c9065117b2b179f24"; }); - # END + inherit haxe; - buildInputs = [ocaml zlib makeWrapper]; - - inherit zlib; - - buildPhase = '' - mkdir -p ocaml/{swflib,extc,extlib-dev,xml-light} neko/libs - - # strange setup. install.ml seems to co the same repo again into haxe directory! - tar xfz $src --strip-components=1 -C haxe - - t(){ tar xfz $1 -C $2 --strip-components=2; } - t ${src_haxe_swflib} ocaml/swflib - t ${src_haxe_extc} ocaml/extc - t ${src_haxe_extlib_dev} ocaml/extlib-dev - t ${src_haxe_xml_light} ocaml/xml-light - t ${src_haxe_neko_include} neko/libs - - sed -e '/download();/d' \ - -e "s@/usr/lib/@''${zlib}/lib/@g" \ - doc/install.ml > install.ml - - ocaml install.ml - ''; - - # probably rpath should be set properly - installPhase = '' - ensureDir $out/lib/haxe - cp -r bin $out/bin - wrapProgram "$out/bin/haxe" \ - --set "LD_LIBRARY_PATH" $zlib/lib \ - --set HAXE_LIBRARY_PATH "''${HAXE_LIBRARY_PATH}''${HAXE_LIBRARY_PATH:-:}:$out/lib/haxe/std:." - cp -r std $out/lib/haxe/ - ''; - - meta = { - description = "programming language targeting JavaScript, Flash, NekVM, PHP, C++"; - homepage = http://haxe.org; - license = ["GPLv2" "BSD2" /*?*/ ]; # -> docs/license.txt - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + haxelib = tool { + name = "haxelib"; + description = "haxelib is a HaXe library management tool similar to easyinstall or ruby gems"; }; + } diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index e229bd0db02..945359e7590 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -28,8 +28,12 @@ composableDerivation {} ( fixed : { sed -i \ -e 's@"/usr/include",@${includes}@' \ src/tools/install.neko - sed -i "s@/usr/local@$out@" Makefile + sed -i "s@/usr/local@$out@" Makefile vm/load.c + # make sure that nekotools boot finds the neko executable and not our wrapper: ensureDir $out/{bin,lib} + + sed -i "s@\"neko\"@\".neko-wrapped\"@" src/tools/nekoboot.neko + ln -s ./neko bin/.neko-wrapped ''; inherit zlib; @@ -45,12 +49,18 @@ composableDerivation {} ( fixed : { # if stripping was done neko and nekoc would be the same. ?! dontStrip = 1; + # neko-wrapped: nekotools boot has to find it. So don't prefix wrapped executable by "." postInstall = '' - wrapProgram "$out/bin/nekoc" \ - --set "LD_LIBRARY_PATH" $out/lib/neko \ + for prog in nekotools nekoc; do + wrapProgram "$out/bin/$prog" \ + --prefix "LD_LIBRARY_PATH" $out/lib/neko + done wrapProgram "$out/bin/neko" \ - --set "LD_LIBRARY_PATH" $out/lib/neko \ + --prefix "LD_LIBRARY_PATH" $out/lib/neko + + # create symlink so that nekotools boot finds not wrapped neko-wrapped executable + ln -s ln -s ../../bin/.neko-wrapped $out/lib/neko ''; # TODO make them optional and make them work diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8a55f8d535..53aa72f2e75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2257,9 +2257,11 @@ let }; }; - haxe = import ../development/compilers/haxe { - inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper; + haxeDist = import ../development/compilers/haxe { + inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko; }; + haxe = haxeDist.haxe; + haxelib = haxeDist.haxelib; falcon = builderDefsPackage (import ../development/interpreters/falcon) { inherit cmake; From f7aad3221abbe1ab741ef38b85d8227bf6975948 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Mar 2010 06:41:09 +0000 Subject: [PATCH 054/313] Data for Zen-kernel 2.6.33-zen1 svn path=/nixpkgs/trunk/; revision=20675 --- .../linux/zen-kernel/2.6.33-zen1.nix | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix new file mode 100644 index 00000000000..ae27dde09cc --- /dev/null +++ b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix @@ -0,0 +1,75 @@ +args @ {stdenv, fetchurl, xz, runCommand, userModeLinux ? false, extraConfig ? "", + kernelPatches ? [], extraMeta ? {}, + features ? {}, preConfigure ? "", + ...}: + +let + conf = import ../kernel/config-blocks.nix; + +in + +import ../kernel/generic.nix ( + rec { + version = "2.6.32-zen4"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.33.tar.bz2"; + sha256 = "1inmam21w13nyf5imgdb5palhiap41zcxf9k32i4ck1w7gg3gqk3"; + }; + + kernelPatches = [ + { + name = "zen4"; + patch = runCommand "2.6.33-zen1.patch" {} "${xz}/bin/lzma -d < ${ fetchurl { + name = "2.6.33-zen1"; + url = "http://downloads.zen-kernel.org/2.6.33/2.6.33-zen1.patch.lzma"; + sha256 = "0a72d8allr4qi4p6hbbjh33kmcgbg84as0dfb50gsffvaj2d3kwf"; + } } > $out"; + } + ] + ++ + stdenv.lib.attrByPath ["kernelPatches"] [] args; + + features = { + iwlwifi = true; + zen = true; + fbConDecor = true; + aufs = true; + } // (stdenv.lib.attrByPath ["features"] {} args); + + config = with conf; + '' + ${generalOptions} + ${noDebug} + ${virtualisation} + ${if stdenv.lib.attrByPath ["features" "oldI686"] false args then noPAE else ""} + ${usefulSubsystems} + ${cfq} + ${noNUMA} + ${networking} + ${wireless} + ${fb} + ${fbConDecor} + ${sound} + ${usbserial} + ${fsXattr} + ${security} + ${blockDevices} + ${bluetooth} + ${misc} + ${if stdenv.lib.attrByPath ["features" "ckSched"] false args then bfsched else forceCFSched} + ''; + + preConfigure = '' + mv README.zen README-zen + '' + stdenv.lib.attrByPath ["preConfigure"] "" args; + + extraMeta = { + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = with stdenv.lib.platforms; + linux; + } // stdenv.lib.attrByPath ["extraMeta"] {} args; + } + // removeAttrs args ["extraConfig" "extraMeta" "features" "kernelPatches" + "xz" "runCommand" "preConfigure"] +) From 1163f22972db1c8cfd47b21160d469fcc69e4c57 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Mar 2010 06:42:21 +0000 Subject: [PATCH 055/313] Add 2.6.33-zen1 kernels svn path=/nixpkgs/trunk/; revision=20676 --- pkgs/top-level/all-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53aa72f2e75..811f04fc105 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6010,6 +6010,22 @@ let ]; }; + linux_2_6_33_zen1 = makeOverridable (import ../os-specific/linux/zen-kernel/2.6.33-zen1.nix) { + inherit fetchurl stdenv perl mktemp module_init_tools runCommand xz; + }; + + linux_2_6_33_zen1_oldi686 = linux_2_6_33_zen1.override { + features = { + oldI686 = true; + }; + }; + + linux_2_6_33_zen1_bfs = linux_2_6_33_zen1.override { + features = { + ckSched = true; + }; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages From f0ce6cfe94bb417ebba7b159220c5943b5e7a828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 17 Mar 2010 09:05:11 +0000 Subject: [PATCH 056/313] Trying to remove evaluation errors in hydra nixpkgs for the cross compiler related derivations. I remove their 'meta platforms' attribute, defined in the gcc expression, so hydra does not attempt to build them in the nixpkgs evaluation. svn path=/nixpkgs/trunk/; revision=20678 --- pkgs/top-level/all-packages.nix | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 811f04fc105..a75aeb7b391 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1974,19 +1974,20 @@ let cross = assert crossSystem != null; crossSystem; }; - gcc44_realCross = makeOverridable (import ../development/compilers/gcc-4.4) { - inherit stdenv fetchurl texinfo gmp mpfr ppl cloogppl noSysDirs - gettext which; - binutilsCross = binutilsCross; - libcCross = libcCross; - profiledCompiler = false; - enableMultilib = false; - # cross-building for ultrasparc in 4.4.3 will require disabling shared due to a gcc bug. - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818 - enableShared = if (crossSystem.arch == "sparc64") then false else true; - crossStageStatic = false; - cross = assert crossSystem != null; crossSystem; - }; + gcc44_realCross = lib.addMetaAttrs { platforms = []; } ( + makeOverridable (import ../development/compilers/gcc-4.4) { + inherit stdenv fetchurl texinfo gmp mpfr ppl cloogppl noSysDirs + gettext which; + binutilsCross = binutilsCross; + libcCross = libcCross; + profiledCompiler = false; + enableMultilib = false; + # cross-building for ultrasparc in 4.4.3 will require disabling shared due to a gcc bug. + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818 + enableShared = if (crossSystem.arch == "sparc64") then false else true; + crossStageStatic = false; + cross = assert crossSystem != null; crossSystem; + }); gccCrossStageStatic = wrapGCCCross { gcc = forceBuildDrv (gcc44_realCross.override { From 6934d0770cee97e75e43c2e1b88716a8a94700f8 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Mar 2010 10:04:35 +0000 Subject: [PATCH 057/313] Fix build of fresh Zen kernels: POSIX ACL seems to be non-optional in OCFS2 now svn path=/nixpkgs/trunk/; revision=20684 --- pkgs/os-specific/linux/kernel/config-blocks.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/config-blocks.nix b/pkgs/os-specific/linux/kernel/config-blocks.nix index f30bc486f5b..f330325c91b 100644 --- a/pkgs/os-specific/linux/kernel/config-blocks.nix +++ b/pkgs/os-specific/linux/kernel/config-blocks.nix @@ -175,7 +175,7 @@ rec { XFS_POSIX_ACL y XFS_RT y # XFS Realtime subvolume support OCFS2_DEBUG_MASKLOG n - OCFS2_FS_POSIX_ACL y + OCFS2_FS_POSIX_ACL? y BTRFS_FS_POSIX_ACL y UBIFS_FS_XATTR y UBIFS_FS_ADVANCED_COMPR y From 4824ecbb62a867ecd3d09d605f5e8413ff4ed7f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 17 Mar 2010 10:17:32 +0000 Subject: [PATCH 058/313] Trying to remove more hydra evaluation errors related to gcc. svn path=/nixpkgs/trunk/; revision=20687 --- pkgs/development/compilers/gcc-4.4/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index 85a3aee4c89..9ec2c485992 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -221,7 +221,9 @@ stdenv.mkDerivation ({ ]; # Volunteers needed for the {Cyg,Dar}win ports of *PPL. - platforms = stdenv.lib.platforms.linux ++ [ "i686-darwin" ]; + # gnatboot is not available out of linux platforms, so we disable the darwin build + # for the gnat (ada compiler). + platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ]; }; } // (if langVhdl then rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a75aeb7b391..56fd9f3c6ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1974,8 +1974,8 @@ let cross = assert crossSystem != null; crossSystem; }; - gcc44_realCross = lib.addMetaAttrs { platforms = []; } ( - makeOverridable (import ../development/compilers/gcc-4.4) { + gcc44_realCross = lib.addMetaAttrs { platforms = []; } + (makeOverridable (import ../development/compilers/gcc-4.4) { inherit stdenv fetchurl texinfo gmp mpfr ppl cloogppl noSysDirs gettext which; binutilsCross = binutilsCross; @@ -1990,12 +1990,13 @@ let }); gccCrossStageStatic = wrapGCCCross { - gcc = forceBuildDrv (gcc44_realCross.override { + gcc = forceBuildDrv (lib.addMetaAttrs { platforms = []; } ( + gcc44_realCross.override { crossStageStatic = true; langCC = false; libcCross = null; enableShared = true; - }); + })); libc = null; binutils = binutilsCross; cross = assert crossSystem != null; crossSystem; From 8396168276aa693364a76731bc8267df014ed421 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 17 Mar 2010 12:16:03 +0000 Subject: [PATCH 059/313] * Updated Nix to 0.15. svn path=/nixpkgs/trunk/; revision=20697 --- pkgs/tools/package-management/nix/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index a2685ead6c2..c655637d1fb 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "nix-0.14"; + name = "nix-0.15"; src = fetchurl { - url = "http://hydra.nixos.org/build/281118/download/4/${name}.tar.bz2"; - sha256 = "7df3dd52a7a42354e845302665c3e1f67af287f9cca2bda67f8abb724e52c519"; + url = "http://hydra.nixos.org/build/326788/download/4/${name}.tar.bz2"; + sha256 = "2d125e75dba387075a8bd443926d7fc6752e54cc9a21c2ef32e44fffc445a8ce"; }; buildInputs = [ perl curl openssl ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56fd9f3c6ca..66bdb4e5f8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9102,11 +9102,14 @@ let }; # The bleeding edge. + nixUnstable = nix; + /* nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) { inherit fetchurl stdenv perl curl bzip2 openssl aterm; storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; }; + */ # The SQLite branch. nixSqlite = lowPrio (makeOverridable (import ../tools/package-management/nix/sqlite.nix) { From 26ca329ec47830da5acf3150916d0982131c80c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 17 Mar 2010 13:27:05 +0000 Subject: [PATCH 060/313] Making gitFull get the subversion as it wants: with perlBindings. This should allow hydra building it properly. svn path=/nixpkgs/trunk/; revision=20701 --- .../version-management/git-and-tools/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 7992300eb8c..c81b7ca3e13 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -22,10 +22,14 @@ rec { inherit fetchurl stdenv curl openssl zlib expat perl python gettext asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt - cpio tcl tk makeWrapper subversion; + cpio tcl tk makeWrapper; svnSupport = true; guiSupport = true; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; + # gitFull requires subversion with perlBindings enabled at least + subversion = subversion.override { + perlBindings = true; + }; }; gitGit = import ./git/git-git.nix { From 2dfbcfcc7ce72af2ed03cb4cf872b37dca44fe60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Mar 2010 13:56:36 +0000 Subject: [PATCH 061/313] Stalin: Add maintainer. svn path=/nixpkgs/trunk/; revision=20707 --- pkgs/development/compilers/stalin/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix index 37b7baa4382..b9e71a9d203 100644 --- a/pkgs/development/compilers/stalin/default.nix +++ b/pkgs/development/compilers/stalin/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cp README "$out/doc/${name}" ensureDir "$out/share/${name}/include" - cp include/* "$out/share/${name}/include" + cp "include/"* "$out/share/${name}/include" substituteInPlace "$out/bin/stalin" \ --replace "$PWD/include/stalin" "$out/share/${name}/include/stalin" @@ -38,5 +38,8 @@ stdenv.mkDerivation rec { homepage = http://www.ece.purdue.edu/~qobi/software.html; license = "GPLv2+"; description = "Stalin, an optimizing Scheme compiler"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } From 9e16b812e0ed89c3e9c58f2e20ede5deb5321181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Mar 2010 13:56:40 +0000 Subject: [PATCH 062/313] Mono: Don't strip binaries. svn path=/nixpkgs/trunk/; revision=20708 --- pkgs/development/compilers/mono/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 34e12fff18d..fbbaf72fe7d 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lgcc_s" ; + # Attempt to fix this error when running "mcs --version": + # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image + dontStrip = true; + preBuild = " makeFlagsArray=(INSTALL=`type -tp install`) patchShebangs ./ From ee149814c4c40b7771cde56b6df090cb244aaa69 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 17 Mar 2010 14:29:18 +0000 Subject: [PATCH 063/313] help2man 1.37.1 svn path=/nixpkgs/trunk/; revision=20710 --- pkgs/development/tools/misc/help2man/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 1e053546cae..a8ff3aef4ed 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext, LocaleGettext}: stdenv.mkDerivation { - name = "help2man-1.35.1"; + name = "help2man-1.37.1"; src = fetchurl { - url = http://ftp.gnu.org/gnu/help2man/help2man-1.35.1.tar.gz; - md5 = "e3c9e846dd163eb7f1d1661e2d0baa07"; + url = http://ftp.gnu.org/gnu/help2man/help2man-1.37.1.tar.gz; + sha256 = "0q8msq7b71rdg73r49ibvljsr6i4rpqy7l52l9qca8p7z0gaji1v"; }; buildInputs = [ From dd5de51265292e754519bf4a475d24a77242d841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Mar 2010 14:44:42 +0000 Subject: [PATCH 064/313] ncompress 4.2.4.3. svn path=/nixpkgs/trunk/; revision=20712 --- pkgs/tools/compression/ncompress/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index a97ab190678..bfdb70c697d 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -1,20 +1,20 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "ncompress-4.2.4"; - +stdenv.mkDerivation rec { + name = "ncompress-4.2.4.3"; + builder = ./builder.sh; patches = [ ./makefile.patch ]; - + src = fetchurl { - url = mirror://sourceforge/project/ncompress/ncompress%20%28bugfixes%29/ncompress-4.2.4.2/ncompress-4.2.4.2.tar.gz; - sha256 = "38158c792b769fe23c74f8d3ea0e27569a9b1d21b53a4faf8acbb1ac03743221"; + url = "mirror://sourceforge/project/ncompress/${name}.tar.gz"; + sha256 = "1y44ixc1w2vfvj1lm4dkcljlwv882ynrvm5i6l0lg1gf883j246l"; }; meta = { homepage = http://ncompress.sourceforge.net/; - license = "free-non-copyleft"; + license = "public domain"; description = "A fast, simple LZW file compressor"; }; } From d5c0333db86643bec94e020b8c36e66ed6d73723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Mar 2010 14:44:46 +0000 Subject: [PATCH 065/313] Stalin: Add dependency on ncompress. svn path=/nixpkgs/trunk/; revision=20713 --- pkgs/development/compilers/stalin/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix index b9e71a9d203..acae45626a0 100644 --- a/pkgs/development/compilers/stalin/default.nix +++ b/pkgs/development/compilers/stalin/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libX11 }: +{ fetchurl, stdenv, ncompress, libX11 }: stdenv.mkDerivation rec { name = "stalin-0.11"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lz8riccpigdixwf6dswwva6s4kxaz3dzxhkqhcxgwmffy30vw8s"; }; - buildInputs = [ libX11 ]; + buildInputs = [ ncompress libX11 ]; buildPhase = '' ./build ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66bdb4e5f8e..6d6e4819f47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2414,7 +2414,7 @@ let }; stalin = import ../development/compilers/stalin { - inherit stdenv fetchurl; + inherit stdenv fetchurl ncompress; inherit (xlibs) libX11; }; From 10637c8754d4ef08d7366a0408db1fa5cbf59b8a Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 17 Mar 2010 15:06:05 +0000 Subject: [PATCH 066/313] downgrade help2man svn path=/nixpkgs/trunk/; revision=20715 --- pkgs/development/tools/misc/help2man/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index a8ff3aef4ed..6f131e7abe7 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext, LocaleGettext}: stdenv.mkDerivation { - name = "help2man-1.37.1"; + name = "help2man-1.36.1"; src = fetchurl { - url = http://ftp.gnu.org/gnu/help2man/help2man-1.37.1.tar.gz; - sha256 = "0q8msq7b71rdg73r49ibvljsr6i4rpqy7l52l9qca8p7z0gaji1v"; + url = http://ftp.gnu.org/gnu/help2man/help2man-1.36.1.tar.gz; + sha256 = "13w20lfvggzhvzs9dinxbhwdd61svsacfv9d78zfl9lf1syb5i1f"; }; buildInputs = [ From cd8cc93432d9433c305145638299b5a63d72f7c9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Mar 2010 15:13:13 +0000 Subject: [PATCH 067/313] Update Monotone svn path=/nixpkgs/trunk/; revision=20716 --- pkgs/applications/version-management/monotone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 061f4bef3d5..b8b06e66102 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -2,13 +2,13 @@ lua, pcre, sqlite, perl, lib}: let - version = "0.46"; + version = "0.47"; in stdenv.mkDerivation rec { name = "monotone-${version}"; inherit perl; src = fetchurl { url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.gz"; - sha256 = "1pla2fvkmfbrzfbdqd2jjghldpxl9iq81pwwkwaxa7n57snbvq61"; + sha256 = "7a99f1a5e4eb2bb7bf82794ab7fc61435fbc55826b710243243c52f7b10be51b"; }; buildInputs = [boost zlib botan libidn lua pcre sqlite]; preConfigure = '' From 6574a35e56e764393b25b1dacefade25a73516c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Mar 2010 15:32:12 +0000 Subject: [PATCH 068/313] Add MIT/GNU Scheme. svn path=/nixpkgs/trunk/; revision=20719 --- .../compilers/mit-scheme/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/compilers/mit-scheme/default.nix diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix new file mode 100644 index 00000000000..629aec850d8 --- /dev/null +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -0,0 +1,36 @@ +{ fetchurl, stdenv }: + +let version = "9.0.1"; in +stdenv.mkDerivation { + name = "mit-scheme-${version}"; + + src = fetchurl { + url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz"; + sha256 = "1g2mifrx0bvag0hlrbk81rkrlm1pbn688zw8b9d2i0sl5g2p1ril"; + }; + + preConfigure = "cd src"; + buildPhase = "./etc/make-liarc.sh --prefix=$out"; + + # XXX: The `check' target doesn't exist. + doCheck = false; + + meta = { + description = "MIT/GNU Scheme, a native code Scheme compiler"; + + longDescription = + '' MIT/GNU Scheme is an implementation of the Scheme programming + language, providing an interpreter, compiler, source-code debugger, + integrated Emacs-like editor, and a large runtime library. MIT/GNU + Scheme is best suited to programming large applications with a rapid + development cycle. + ''; + + homepage = http://www.gnu.org/software/mit-scheme/; + + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d6e4819f47..ec0959f9f1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2346,6 +2346,10 @@ let inherit llvm perl libtool bison; }; + mitscheme = import ../development/compilers/mit-scheme { + inherit fetchurl stdenv; + }; + mono = import ../development/compilers/mono { inherit fetchurl stdenv bison pkgconfig gettext perl glib; }; From b4b3cb2d013dfc1073da9036db26a77825063f7a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 18 Mar 2010 05:26:50 +0000 Subject: [PATCH 069/313] Fix version problems in Zen-kernel expression svn path=/nixpkgs/trunk/; revision=20727 --- pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix index ae27dde09cc..a3824a4fb15 100644 --- a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix +++ b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix @@ -6,23 +6,26 @@ args @ {stdenv, fetchurl, xz, runCommand, userModeLinux ? false, extraConfig ? " let conf = import ../kernel/config-blocks.nix; + baseKernelVersion = "2.6.33"; + ZenSuffix = "zen1"; + in import ../kernel/generic.nix ( rec { - version = "2.6.32-zen4"; + version = "${baseKernelVersion}-${ZenSuffix}"; src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.33.tar.bz2"; + url = "mirror://kernel/linux/kernel/v2.6/linux-${baseKernelVersion}.tar.bz2"; sha256 = "1inmam21w13nyf5imgdb5palhiap41zcxf9k32i4ck1w7gg3gqk3"; }; kernelPatches = [ { - name = "zen4"; - patch = runCommand "2.6.33-zen1.patch" {} "${xz}/bin/lzma -d < ${ fetchurl { - name = "2.6.33-zen1"; - url = "http://downloads.zen-kernel.org/2.6.33/2.6.33-zen1.patch.lzma"; + name = "${ZenSuffix}"; + patch = runCommand "${baseKernelVersion}-${ZenSuffix}.patch" {} "${xz}/bin/lzma -d < ${ fetchurl { + name = "${baseKernelVersion}-${ZenSuffix}.patch.lzma"; + url = "http://downloads.zen-kernel.org/${baseKernelVersion}/${baseKernelVersion}-${ZenSuffix}.patch.lzma"; sha256 = "0a72d8allr4qi4p6hbbjh33kmcgbg84as0dfb50gsffvaj2d3kwf"; } } > $out"; } From 42ef635518bdb4c88e6544db4556da60ea132e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Mar 2010 15:47:29 +0000 Subject: [PATCH 070/313] DejaGNU: Fix the default target found by `runtest'. svn path=/nixpkgs/trunk/; revision=20744 --- pkgs/development/tools/misc/dejagnu/default.nix | 2 ++ .../dejagnu/wrapped-runtest-program-name.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 7ac79ecb12a..fec825627ea 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "13841q6pfwd9d1sdw48yxdyb4xhiccii0mb0ilql627v43pyvyyh"; }; + patches = [ ./wrapped-runtest-program-name.patch ]; + buildInputs = [ expect makeWrapper ]; # FIXME: Enable when the "spawn id" problem is fixed. diff --git a/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch b/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch new file mode 100644 index 00000000000..d745bc65cbb --- /dev/null +++ b/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch @@ -0,0 +1,15 @@ +This patch gives `runtest' a `$0' that contains `runtest' instead +of `.runtest-wrapped'. This is required because `runtest' checks +what `$0' looks like to determine the target. + +--- dejagnu-1.4.4/runtest 2003-08-17 03:27:59.000000000 +0200 ++++ dejagnu-1.4.4/runtest 2010-03-18 15:57:58.000000000 +0100 +@@ -10,6 +10,7 @@ + # Get the execution path to this script and the current directory. + # + mypath=${0-.} ++mypath="`echo $mypath | sed -'es|\.runtest-wrapped|runtest|g'`" + if expr ${mypath} : '.*/.*' > /dev/null + then + : + From 96eba79858baa3b61a8cd2c6229e7c1f59eb5d57 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 18 Mar 2010 21:12:45 +0000 Subject: [PATCH 071/313] Update SBCL svn path=/nixpkgs/trunk/; revision=20750 --- pkgs/development/compilers/sbcl/src-for-default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index 2e985f17611..efb90273dc6 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.35"; - name="sbcl-1.0.35"; - hash="0iwjaq2a2m2z7ng8sag86vh2l9s2qnw6gv8l0i55qkzpjn9qcb4q"; - url="http://downloads.sourceforge.net/sbcl/files/sbcl/1.0.35/sbcl-1.0.35-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/sbcl/files/sbcl/1.0.35/sbcl-1.0.35-source.tar.bz2"; + version="1.0.36"; + name="sbcl-1.0.36"; + hash="1idshas1zyqdchwv2mhs4x8vzspyr1f1drwinlhynvx35db7in5v"; + url="http://downloads.sourceforge.net/sbcl/files/sbcl/1.0.36/sbcl-1.0.36-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/sbcl/files/sbcl/1.0.36/sbcl-1.0.36-source.tar.bz2"; } From 5ff7d302eaebfaf0fb3e66c3d783139427ef9bbf Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 18 Mar 2010 21:12:59 +0000 Subject: [PATCH 072/313] Update FUSE svn path=/nixpkgs/trunk/; revision=20751 --- pkgs/os-specific/linux/fuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 0c890da77b3..ae21134c2c0 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, utillinux }: stdenv.mkDerivation rec { - name = "fuse-2.8.2"; + name = "fuse-2.8.3"; builder = ./builder.sh; src = fetchurl { url = "mirror://sourceforge/fuse/${name}.tar.gz"; - sha256 = "05sfrw4qzhsysdf1qvd89lvin36ry6rvakmm4zjhf3g1f28rwdr6"; + sha256 = "5edf7f73676976126893c528578c1bf0a264cc34ca8bad7e341e0664157ff2b9"; }; configureFlags = "--disable-kernel-module"; From 1a1cea3076dcdbf064ae4a2355f5412ed126605f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 19 Mar 2010 13:57:17 +0000 Subject: [PATCH 073/313] GNU Guile 1.9.9. svn path=/nixpkgs/trunk/; revision=20762 --- pkgs/development/interpreters/guile/1.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/guile/1.9.nix b/pkgs/development/interpreters/guile/1.9.nix index ef3c9a16f56..084c7bc885d 100644 --- a/pkgs/development/interpreters/guile/1.9.nix +++ b/pkgs/development/interpreters/guile/1.9.nix @@ -7,11 +7,11 @@ else stdenv.mkDerivation) rec { - name = "guile-1.9.8"; # This is a beta release! + name = "guile-1.9.9"; # This is a beta release! src = fetchurl { url = "ftp://alpha.gnu.org/gnu/guile/${name}.tar.gz"; - sha256 = "1b8n1dma3fbxf2j3hprl43xnwfs4knqp2g85s5gsq2j1grlmrb5g"; + sha256 = "1il7jalgx1z5z3hicvs41nc8yls2hrcnfm3dcpr4kr8nzzmz28s9"; }; buildInputs = From 1b32982a589360d4f6dab8c1c278a7a2b3ac89a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sat, 20 Mar 2010 14:09:32 +0000 Subject: [PATCH 074/313] Version bump. svn path=/nixpkgs/trunk/; revision=20767 --- pkgs/development/libraries/haskell/uulib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix index 2514da38ad7..9b29afb1557 100644 --- a/pkgs/development/libraries/haskell/uulib/default.nix +++ b/pkgs/development/libraries/haskell/uulib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "uulib"; - version = "0.9.11"; - sha256 = "f364ec14f249c9fc28ab341050c7e1cc1bde865fb787e4456c07c1df450815c8"; + version = "0.9.12"; + sha256 = "e2ea76db10e5ce94cf6282642754d0e65e5abadc620b3827aa2ab497b88e6747"; meta = { description = "Haskell Utecht Tools Library"; }; From a5586000d4964a1bdf179d6f0bbdc7220ec6f83e Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 22 Mar 2010 11:13:02 +0000 Subject: [PATCH 075/313] fix subversion perl bindings for gitFull svn path=/nixpkgs/trunk/; revision=20771 --- .../applications/version-management/git-and-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index c81b7ca3e13..cf24e21db0e 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -18,7 +18,7 @@ rec { }; # The full-featured Git. - gitFull = import ./git { + gitFull = import ./git rec { inherit fetchurl stdenv curl openssl zlib expat perl python gettext asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt @@ -27,7 +27,7 @@ rec { guiSupport = true; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; # gitFull requires subversion with perlBindings enabled at least - subversion = subversion.override { + subversion = pkgs.subversion.override { perlBindings = true; }; }; From 08f80eb9fbe1d5ff004de6b548b72081c8fafeb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 22 Mar 2010 15:58:25 +0000 Subject: [PATCH 076/313] Updating unrar. svn path=/nixpkgs/trunk/; revision=20772 --- pkgs/tools/archivers/unrar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 1667156adab..c790f767f12 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "unrar-3.9.7"; + name = "unrar-3.9.10"; src = fetchurl { - url = http://www.rarlab.com/rar/unrarsrc-3.9.7.tar.gz; - sha256 = "101w7fgfr5biyic8gj0km5aqi4xj8dikh4aa0rx0qvg8bjp19wb4"; + url = http://www.rarlab.com/rar/unrarsrc-3.9.10.tar.gz; + sha256 = "0yi0i2j4srca8cag96ajc80m5xb5328ydzjab6y8h1bhypc2fiiv"; }; # Add a missing objects to the library From 00726e62fc3298a89dfa89c0233c49b7477d8702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 22 Mar 2010 20:01:48 +0000 Subject: [PATCH 077/313] Fixing some sheevaplug linux kernel configuration options, because they were bad written. I also added the support for tun devices. svn path=/nixpkgs/trunk/; revision=20773 --- pkgs/top-level/platforms.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 6ac865ea8d8..5244769a261 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -43,9 +43,10 @@ rec { EXT4_FS m USB_STORAGE_CYPRESS_ATACB m - CONFIG_IP_PNP y - CONFIG_NFS_FS y - CONFIG_ROOT_NFS y + IP_PNP y + NFS_FS y + ROOT_NFS y + TUN m # Fail to build DRM n @@ -61,8 +62,6 @@ rec { ATM_HE n SCSI_ACARD n BLK_DEV_CMD640_ENHANCED n - - IP_PNP y ''; kernelTarget = "uImage"; uboot = "sheevaplug"; From 6ea441fb3d477a808cf576343105f3ca5cb1201b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Mar 2010 09:34:47 +0000 Subject: [PATCH 078/313] pkgs/development/libraries/sqlite: updated to version 3.6.23 svn path=/nixpkgs/trunk/; revision=20774 --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 3e9d2804ced..f700b862246 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.6.22"; + name = "sqlite-3.6.23"; src = fetchurl { - url = "http://www.sqlite.org/sqlite-amalgamation-3.6.22.tar.gz"; - sha256 = "1k5qyl0v2y4fpkh7vvxvb0irpnl71g0ffhfc3ksm40mrhcdq9qk8"; + url = "http://www.sqlite.org/sqlite-amalgamation-3.6.23.tar.gz"; + sha256 = "a5de9ec9273acabc6cb18235df802549c476410b09d58a206e02862b4dc303ae"; }; buildInputs = [readline ncurses]; From d791abd982d7b395c412f9427d49cb310a79fa96 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Mar 2010 09:34:52 +0000 Subject: [PATCH 079/313] pkgs/development/interpreters/python/2.6: updated to version 2.6.5 svn path=/nixpkgs/trunk/; revision=20775 --- pkgs/development/interpreters/python/2.6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 2d607926a23..88e9c32a808 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -22,7 +22,7 @@ with stdenv.lib; let majorVersion = "2.6"; - version = "${majorVersion}.4"; + version = "${majorVersion}.5"; buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ @@ -48,7 +48,7 @@ stdenv.mkDerivation ( { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "dad8d5575144a210d5cc4fdbc40b8a26386e9cdb1ef58941bec0be02c7cb9d89"; + sha256 = "62da62eb685621ede2be1275f11b89fa0e0be578db8daa5320d0a7855c0a9ebc"; }; patches = [ From 9c9620b33414b52b4b4a39f1cb4a0eeb59d2a342 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Mar 2010 09:34:58 +0000 Subject: [PATCH 080/313] pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.0.3 svn path=/nixpkgs/trunk/; revision=20776 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 334b72cea06..7e4e903f2c7 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,11 +10,11 @@ assert svnSupport -> (subversion != null && perlLibs != [] && subversion.perlBindings); stdenv.mkDerivation rec { - name = "git-1.7.0.2"; + name = "git-1.7.0.3"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "0bvb3ankwjqlvs3ibw1q0k2wyzdp9rlq5clnw5nxdzc2q9zxy0an"; + sha256 = "f68774019b52ac462da48a5315ce1f4dcd64a2327de4a14d13014bdc0c50f841"; }; patches = [ ./docbook2texi.patch ]; From 4bd60ef8fc9f27e9ad876f5b6b29add9bec6c493 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 23 Mar 2010 10:27:47 +0000 Subject: [PATCH 081/313] * Updated Firefox to 3.6.2. Hopefully it works now. svn path=/nixpkgs/trunk/; revision=20777 --- pkgs/applications/networking/browsers/firefox/3.6.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix index 03c06e0bf37..5d926c92a66 100644 --- a/pkgs/applications/networking/browsers/firefox/3.6.nix +++ b/pkgs/applications/networking/browsers/firefox/3.6.nix @@ -12,14 +12,14 @@ rec { - firefoxVersion = "3.6"; + firefoxVersion = "3.6.2"; - xulVersion = "1.9.2"; # this attribute is used by other packages + xulVersion = "1.9.2.2"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "33226b45a0bcd795545a980cab475c5492f0ea69"; + sha1 = "7befdbcc2bd658c136bdce1c1bd8b54201c1d1d1"; }; From bba9ecdbac1d629ba7ae8ad1c4ae544a138ad50d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Mar 2010 11:56:44 +0000 Subject: [PATCH 082/313] pkgs/applications/editors/emacs-modes/magit: updated to version 0.7-109-g0fc3980 svn path=/nixpkgs/trunk/; revision=20779 --- pkgs/applications/editors/emacs-modes/magit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index ec7e1123128..f3227374f69 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, emacs, texinfo, autoconf, automake}: stdenv.mkDerivation { - name = "magit-0.7-94-gbf42bf8"; + name = "magit-0.7-109-g0fc3980.tar.gz"; src = fetchurl { - url = "http://cryp.to/magit-mainline-0.7-94-gbf42bf8.tar.gz"; - sha256 = "16km4bjp8l011zfqy71jdh0skw829n8r5lgdy6gj996i2bis8hv5"; + url = "http://cryp.to/magit-mainline-0.7-109-g0fc3980.tar.gz"; + sha256 = "0jyx57znvn49xm0h92kh8iywn44ip130dpflzq2ns2k6gspg36b6"; }; unpackCmd = "tar xf $src"; preConfigure = "./autogen.sh"; From 47e93b41775c27ce5b9c15557785d577f1584572 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Mar 2010 12:29:21 +0000 Subject: [PATCH 083/313] pkgs/applications/editors/emacs-modes/magit: fixed cut&paste error in name attribute Thanks, Eelco! svn path=/nixpkgs/trunk/; revision=20780 --- pkgs/applications/editors/emacs-modes/magit/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index f3227374f69..4f0b760ae20 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,10 +1,13 @@ {stdenv, fetchurl, emacs, texinfo, autoconf, automake}: +let + version = "0.7-109-g0fc3980"; +in stdenv.mkDerivation { - name = "magit-0.7-109-g0fc3980.tar.gz"; + name = "magit-${version}"; src = fetchurl { - url = "http://cryp.to/magit-mainline-0.7-109-g0fc3980.tar.gz"; + url = "http://cryp.to/magit-mainline-${version}.tar.gz"; sha256 = "0jyx57znvn49xm0h92kh8iywn44ip130dpflzq2ns2k6gspg36b6"; }; unpackCmd = "tar xf $src"; From 1771bf00519e42f42888e6080d1f07d986fa53f2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 23 Mar 2010 13:00:06 +0000 Subject: [PATCH 084/313] Update fltk svn path=/nixpkgs/trunk/; revision=20781 --- pkgs/development/libraries/fltk/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index d3a9f9ea3e8..1fb1cda3353 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,12 +1,12 @@ args: with args; let inherit (args.composableDerivation) composableDerivation edf; in -composableDerivation {} { +composableDerivation {} rec { - name = "fltk-2.0.x-r6483"; + name = "fltk-2.0.x-r6970"; src = args.fetchurl { - url = ftp://ftp.easysw.com/pub/fltk/snapshots/fltk-2.0.x-r6483.tar.bz2; - sha256 = "1n8b53r5p0zb4sbvr6pj8aasls4zjwksv1sdc3r3pzb20fikp5jb"; + url = "ftp://ftp.easysw.com/pub/fltk/snapshots/${name}.tar.bz2"; + sha256 = "0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3"; }; propagatedBuildInputs=[x11 inputproto libXi freeglut]; From 9dd466d123a3b909a3e8eaca0eb8a958af2aa84f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 23 Mar 2010 14:04:47 +0000 Subject: [PATCH 085/313] * Updated pyqt and sip because the old versions have disappeared. * Removed some unused versions of those packages. * Don't pass `lib' to packages (because we already have `stdenv.lib'). * Removed some `*_python26' variants because Python 2.6 is the default now. svn path=/nixpkgs/trunk/; revision=20782 --- pkgs/applications/misc/calibre/default.nix | 15 +++--- .../python-modules/pyqt/3.17.4.nix | 20 ------- .../development/python-modules/pyqt/4.3.3.nix | 21 -------- pkgs/development/python-modules/pyqt/4.7.nix | 12 +++-- .../python-modules/pyqt/default.nix | 10 ++-- .../python-modules/python-sip/4.10.nix | 16 +++--- .../python-modules/python-sip/4.7.4.nix | 18 ------- .../python-modules/python-sip/default.nix | 8 ++- pkgs/top-level/all-packages.nix | 53 +++++-------------- 9 files changed, 53 insertions(+), 120 deletions(-) delete mode 100644 pkgs/development/python-modules/pyqt/3.17.4.nix delete mode 100644 pkgs/development/python-modules/pyqt/4.3.3.nix delete mode 100644 pkgs/development/python-modules/python-sip/4.7.4.nix diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 8ec1c5cd227..f3664d85430 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,6 +1,7 @@ -{stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng, -imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil, -pil, cssutils, beautifulsoap, makeWrapper, unrar}: +{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng +, imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil +, pil, cssutils, beautifulsoap, makeWrapper, unrar +}: stdenv.mkDerivation rec { name = "calibre-0.6.43"; @@ -12,9 +13,11 @@ stdenv.mkDerivation rec { inherit python; - buildInputs = [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick - libjpeg fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper cssutils - beautifulsoap ]; + buildInputs = + [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg + fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper + cssutils beautifulsoap + ]; installPhase = '' export HOME=$TMPDIR/fakehome diff --git a/pkgs/development/python-modules/pyqt/3.17.4.nix b/pkgs/development/python-modules/pyqt/3.17.4.nix deleted file mode 100644 index 435997a203c..00000000000 --- a/pkgs/development/python-modules/pyqt/3.17.4.nix +++ /dev/null @@ -1,20 +0,0 @@ -args : with args; -rec { - src = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/p/python-qt3/python-qt3_3.17.4.orig.tar.gz; - sha256 = "0p76g64ww9nhg1sahphanwb7nkjmsvxyaqk8k8iaycnlc8040c8r"; - }; - - buildInputs = [qt python pkgconfig pythonSip libX11 libXext glib]; - configureFlags = [" -q ${qt} "]; - - /* doConfigure should be specified separately */ - phaseNames = ["doPythonConfigure" "doMakeInstall"]; - extraPythonConfigureCommand = ''echo yes | \''; - - name = "python-qt-" + version; - meta = { - description = "Qt bindings for Python"; - license = "GPL"; - }; -} diff --git a/pkgs/development/python-modules/pyqt/4.3.3.nix b/pkgs/development/python-modules/pyqt/4.3.3.nix deleted file mode 100644 index 370366ba0e0..00000000000 --- a/pkgs/development/python-modules/pyqt/4.3.3.nix +++ /dev/null @@ -1,21 +0,0 @@ -args : with args; - -rec { - src = fetchurl { - url = mirror://debian/pool/main/p/python-qt4/python-qt4_4.3.3.orig.tar.gz; - sha256 = "0m8yzaz17nb8prm2kmy0mbiq4np515abi2xkadflsgwq1bj86qyk"; - }; - - buildInputs = [qt python pkgconfig pythonSip libX11 libXext glib]; - configureFlags = [" -p $prefix/share/pyQt4/plugins " '' -e "$prefix/include/python$pythonVersion" '']; - - /* doConfigure should be specified separately */ - phaseNames = ["doPythonConfigure" "doMakeInstall"]; - extraPythonConfigureCommand = ''echo yes | \''; - - name = "python-qt-4.3.3"; - meta = { - description = "Qt bindings for Python"; - license = "GPL"; - }; -} diff --git a/pkgs/development/python-modules/pyqt/4.7.nix b/pkgs/development/python-modules/pyqt/4.7.nix index f6e85c338cb..2390ac771d4 100644 --- a/pkgs/development/python-modules/pyqt/4.7.nix +++ b/pkgs/development/python-modules/pyqt/4.7.nix @@ -1,18 +1,22 @@ -{stdenv, fetchurl, lib, python, sip, qt4}: +{stdenv, fetchurl, python, sip, qt4}: stdenv.mkDerivation { - name = "pyqt-x11-gpl-4.7"; + name = "pyqt-x11-gpl-4.7.2"; + src = fetchurl { url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.tar.gz; sha256 = "0hwp84igw639mgw344q2jmnjarhq5wk60ncn8h2jjg7k4vchbvkz"; }; + configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins"; + buildInputs = [ python sip qt4 ]; + meta = { description = "Python bindings for Qt"; license = "GPL"; homepage = http://www.riverbankcomputing.co.uk; - maintainers = [ lib.maintainers.sander ]; - platforms = lib.platforms.mesaPlatforms; + maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index f2c72f0ff27..4357a4c0ed0 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -1,18 +1,22 @@ -{stdenv, fetchurl, lib, python, sip, qt4}: +{stdenv, fetchurl, python, sip, qt4}: stdenv.mkDerivation { name = "pyqt-x11-gpl-4.5.4"; + src = fetchurl { url = http://pyqwt.sourceforge.net/support/PyQt-x11-gpl-4.5.4.tar.gz; # Not downloading from riverbank, since they remove older releases sha256 = "1a55zng6yhnbk5swc02bkbyccdgf0f0v94yxk9v5a43hv9xnrl5k"; }; + configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins"; + buildInputs = [ python sip qt4 ]; + meta = { description = "Python bindings for Qt"; license = "GPL"; homepage = http://www.riverbankcomputing.co.uk; - maintainers = [ lib.maintainers.sander ]; - platforms = lib.platforms.mesaPlatforms; + maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/python-modules/python-sip/4.10.nix b/pkgs/development/python-modules/python-sip/4.10.nix index cdf7cf9aa40..c64d7be52f7 100644 --- a/pkgs/development/python-modules/python-sip/4.10.nix +++ b/pkgs/development/python-modules/python-sip/4.10.nix @@ -1,16 +1,20 @@ -{stdenv, fetchurl, lib, python}: +{ stdenv, fetchurl, python }: -stdenv.mkDerivation { - name = "sip-4.10"; +stdenv.mkDerivation rec { + name = "sip-4.10.1"; + src = fetchurl { - url = http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-4.10.tar.gz; - sha256 = "15nnwn0x92iz5vh5d16dlqvxl56i8y4n4va53gc3f7z4d557d2nh"; + url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz"; + sha256 = "16pdk86amcl4hnc9vv2y1ihl8ym9hjkh49andm4jahv4630qhc9h"; }; + configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include"; + buildInputs = [ python ]; + meta = { description = "Creates C++ bindings for Python modules"; license = "GPL"; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/development/python-modules/python-sip/4.7.4.nix b/pkgs/development/python-modules/python-sip/4.7.4.nix deleted file mode 100644 index 759246ebf0d..00000000000 --- a/pkgs/development/python-modules/python-sip/4.7.4.nix +++ /dev/null @@ -1,18 +0,0 @@ -args : with args; -rec { - src = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/s/sip4-qt3/sip4-qt3_4.7.4.orig.tar.gz; - sha256 = "0g518b26346q9b0lm13rsgdbq14r4nckyjbf209ylakwx6zir4l5"; - }; - - buildInputs = [python]; - configureFlags = [ '' -e "$prefix/include/python$pythonVersion" '']; - - /* doConfigure should be specified separately */ - phaseNames = ["doPythonConfigure" "doMakeInstall"]; - - name = "python-sip-4.7.4"; - meta = { - description = "Python/C++ bindings generator"; - }; -} diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix index bd08b7e6a24..3fb827e4600 100644 --- a/pkgs/development/python-modules/python-sip/default.nix +++ b/pkgs/development/python-modules/python-sip/default.nix @@ -1,16 +1,20 @@ -{stdenv, fetchurl, lib, python}: +{ stdenv, fetchurl, python }: stdenv.mkDerivation { name = "sip-4.8.2"; + src = fetchurl { url = http://pyqwt.sourceforge.net/support/sip-4.8.2.tar.gz; # Not downloading from riverbank, since they remove older releases sha256 = "1afr2qaibzgf8fq4fmc31jz9hvbwxbg5jvl68ygvkkdvnbg2kfrf"; }; + configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include"; + buildInputs = [ python ]; + meta = { description = "Creates C++ bindings for Python modules"; license = "GPL"; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec0959f9f1b..8d5d41d137f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5328,14 +5328,9 @@ let inherit fetchurl stdenv python zlib libjpeg freetype; }; - pil_python26 = import ../development/python-modules/pil { - inherit fetchurl stdenv zlib libjpeg freetype; - python = python26; - }; - psyco = import ../development/python-modules/psyco { - inherit fetchurl stdenv python; - }; + inherit fetchurl stdenv python; + }; pycairo = import ../development/python-modules/pycairo { inherit fetchurl stdenv python pkgconfig cairo x11; @@ -5373,47 +5368,29 @@ let inherit python openssl; }; - pythonSip = builderDefsPackage (import ../development/python-modules/python-sip/4.7.4.nix) { - inherit python; - }; - rhpl = import ../development/python-modules/rhpl { inherit stdenv fetchurl rpm cpio python wirelesstools gettext; }; - sip = import ../development/python-modules/python-sip { - inherit stdenv fetchurl lib python; + sip = sip48; + + sip48 = import ../development/python-modules/python-sip { + inherit stdenv fetchurl python; }; sip410 = import ../development/python-modules/python-sip/4.10.nix { - inherit stdenv fetchurl lib python; + inherit stdenv fetchurl python; }; - sip_python26 = import ../development/python-modules/python-sip { - inherit stdenv fetchurl lib; - python = python26; - }; - - pyqt = builderDefsPackage (import ../development/python-modules/pyqt/4.3.3.nix) { - inherit pkgconfig python pythonSip glib; - inherit (xlibs) libX11 libXext; - qt = qt4; - }; - - pyqt4 = import ../development/python-modules/pyqt { - inherit stdenv fetchurl lib python sip; + pyqt4 = pyqt45; + + pyqt45 = import ../development/python-modules/pyqt { + inherit stdenv fetchurl python sip; qt4 = qt45; }; - pyqt4_python26 = import ../development/python-modules/pyqt { - inherit stdenv fetchurl lib; - qt4 = qt45; - python = python26; - sip = sip_python26; - }; - pyqt47 = import ../development/python-modules/pyqt/4.7.nix { - inherit stdenv fetchurl lib python; + inherit stdenv fetchurl python; qt4 = qt46; sip = sip410; }; @@ -6892,11 +6869,8 @@ let calibre = import ../applications/misc/calibre { inherit stdenv fetchurl libpng imagemagick pkgconfig libjpeg fontconfig podofo - qt4 makeWrapper unrar; + qt4 makeWrapper unrar sip pyqt4 pil; python = python26Full; - pyqt4 = pyqt4_python26; - sip = sip_python26; - pil = pil_python26; popplerQt4 = popplerQt45; inherit (python26Packages) mechanize lxml dateutil cssutils beautifulsoap; }; @@ -6944,7 +6918,6 @@ let chromeWrapper = wrapFirefox chrome "chrome" ""; - cinelerra = import ../applications/video/cinelerra { inherit lib fetchurl sourceFromHead stdenv automake autoconf libtool From ac94ac33d2c043b812ee53b18692b6250d378bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 23 Mar 2010 16:58:34 +0000 Subject: [PATCH 086/313] Adding 'clientform', a python package. That seems needed for the python package 'mechanize' to build. svn path=/nixpkgs/trunk/; revision=20788 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dcebf275587..3c60ecb3220 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -77,6 +77,23 @@ rec { }; }); + clientform = buildPythonPackage (rec { + name = "clientform-0.2.10"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/C/ClientForm/ClientForm-0.2.10.tar.gz"; + sha256 = "0dydh3i1sx7rrj6d0gj375wkjpiivm7jjlsimw6hmwv4ck7yf1wm"; + }; + + meta = { + homepage = http://wwwsearch.sourceforge.net/ClientForm/; + + license = "bsd"; + + description = "Python module for handling HTML forms on the client side"; + }; + }); + cssutils = buildPythonPackage (rec { name = "cssutils-0.9.7a2"; @@ -265,6 +282,8 @@ rec { sha256 = "1h62mwy4iz09jqz17nrb9j8y0djd500zdfqwrz9xmdwqzqwixkj2"; }; + buildInputs = [ clientform ]; + meta = { description = "Stateful programmatic web browsing in Python"; From b9fcc355c14f8bf0d29536817747fb7559a1960a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 23 Mar 2010 19:28:48 +0000 Subject: [PATCH 087/313] Trying to fix the python package 'mechanize'. Anything building with 'mechanize' needs 'clientform' too. svn path=/nixpkgs/trunk/; revision=20791 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c60ecb3220..16a6544f3ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -282,7 +282,7 @@ rec { sha256 = "1h62mwy4iz09jqz17nrb9j8y0djd500zdfqwrz9xmdwqzqwixkj2"; }; - buildInputs = [ clientform ]; + propagatedBuildInputs = [ clientform ]; meta = { description = "Stateful programmatic web browsing in Python"; From 318234c091a5ebe97cfda4ced5e8ec32fcf6c775 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 23 Mar 2010 19:35:48 +0000 Subject: [PATCH 088/313] * flashplayer: fix the version number. svn path=/nixpkgs/trunk/; revision=20792 --- .../flashplayer-10/default.nix | 61 +++++++++++-------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix index 082d47c8ead..42aea3dffcd 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix @@ -30,33 +30,41 @@ }: -stdenv.mkDerivation ({ - name = "flashplayer-10.0.32.18"; +let - builder = ./builder.sh; - src = if stdenv.system == "x86_64-linux" then - fetchurl ( - if debug then - # no plans to provide a x86_64 version: - # http://labs.adobe.com/technologies/flashplayer10/faq.html - throw "no x86_64 debugging version available" - else { - # -> http://labs.adobe.com/downloads/flashplayer10_64bit.html - url = http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz; - sha256 = "1mkl02cplcl9dygmgzzwic0r7kkdgfkmpfzvk76l665pgf5bbazf"; - } - ) - else - fetchurl ( if debug then { + if debug then + # no plans to provide a x86_64 version: + # http://labs.adobe.com/technologies/flashplayer10/faq.html + throw "no x86_64 debugging version available" + else { + # -> http://labs.adobe.com/downloads/flashplayer10_64bit.html + version = "10.0.45.2"; + url = http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz; + sha256 = "1mkl02cplcl9dygmgzzwic0r7kkdgfkmpfzvk76l665pgf5bbazf"; + } + else if stdenv.system == "i686-linux" then + if debug then { # The debug version also contains a player + version = "10.1pre2-debug-121709"; url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_1_p2_debug_linux_121709.tar.gz; sha256 = "162cnzn8sfdvr8mwyggsxi2bcl7zzi1nrl61bw481hhhpwnrjdx4"; } else { + version = "10.1pre2-121709"; url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_1_p2_linux_121709.tar.gz; sha256 = "1mzxcp7y5zxjnjdqmzq9dzg1jqs9lwb4j2njfhwiw2jifffjw2fw"; - }); + } + else throw "flashplayer is not supported on this platform"; + +in + +stdenv.mkDerivation { + name = "flashplayer-${src.version}"; + + builder = ./builder.sh; + + src = fetchurl { inherit (src) url sha256; }; inherit zlib alsaLib; @@ -64,15 +72,18 @@ stdenv.mkDerivation ({ mozillaPlugin = "/lib/mozilla/plugins"; }; - rpath = stdenv.lib.makeLibraryPath [zlib alsaLib curl nss nspr fontconfig freetype expat libX11 libXext libXrender libXt gtk glib pango atk] ; + rpath = stdenv.lib.makeLibraryPath + [ zlib alsaLib curl nss nspr fontconfig freetype expat libX11 + libXext libXrender libXt gtk glib pango atk + ]; + + buildPhase = stdenv.lib.optionalString debug + '' + tar xfz plugin/debugger/libflashplayer.so.tar.gz + ''; meta = { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; }; -} // (if debug then { - buildPhase = '' - pwd;ls -l . - tar xfz plugin/debugger/libflashplayer.so.tar.gz - ''; - } else {} ) ) +} From 8929e647c6c2d9092258f51f60126604b14f043e Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 23 Mar 2010 20:54:59 +0000 Subject: [PATCH 089/313] generatewrapper fix svn path=/nixpkgs/trunk/; revision=20796 --- pkgs/build-support/release/ant-build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index 89b1db090a5..04eec99c7ed 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation ( header "Generating jar wrappers" '' + (stdenv.lib.concatMapStrings (w: '' - cat >> $out/bin/jclasslib <> $out/bin/${w.name} < Date: Tue, 23 Mar 2010 21:48:38 +0000 Subject: [PATCH 090/313] Updating calibre (now, with chm support) svn path=/nixpkgs/trunk/; revision=20797 --- pkgs/applications/misc/calibre/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index f3664d85430..694b799e738 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil -, pil, cssutils, beautifulsoap, makeWrapper, unrar +, pil, cssutils, beautifulsoap, makeWrapper, unrar, chmlib }: stdenv.mkDerivation rec { - name = "calibre-0.6.43"; + name = "calibre-0.6.45"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.gz"; - sha256 = "1fqrishm5na2h0jh46w1gj7gvav335fixwrk6y7l7l4a6argjslr"; + sha256 = "167qmhj4cp5z3skmhkip7axajqha13qnmxk0rgc8mwvc7kr5q98h"; }; inherit python; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper - cssutils beautifulsoap + cssutils beautifulsoap chmlib ]; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d5d41d137f..598cdf01776 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6869,7 +6869,7 @@ let calibre = import ../applications/misc/calibre { inherit stdenv fetchurl libpng imagemagick pkgconfig libjpeg fontconfig podofo - qt4 makeWrapper unrar sip pyqt4 pil; + qt4 makeWrapper unrar sip pyqt4 pil chmlib; python = python26Full; popplerQt4 = popplerQt45; inherit (python26Packages) mechanize lxml dateutil cssutils beautifulsoap; From d60cba16e2e4629e4bfad58189fcfdee3d068dbc Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Tue, 23 Mar 2010 22:18:25 +0000 Subject: [PATCH 091/313] update to 2.3.0 svn path=/nixpkgs/trunk/; revision=20799 --- pkgs/desktops/kde-4.4/extragear/amarok/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix index 45acaf1f1c6..0219ac411cb 100644 --- a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix @@ -2,10 +2,10 @@ , kdelibs, automoc4, phonon, strigi, soprano, qca2}: stdenv.mkDerivation { - name = "amarok-2.2.2"; + name = "amarok-2.3.0"; src = fetchurl { - url = mirror://kde/stable/amarok/2.2.2/src/amarok-2.2.2.tar.bz2; - sha256 = "0kg67b9wz2wi1gyn229vzbib4s0wpgqrjyfqy0032yl9fa2k13bn"; + url = mirror://kde/stable/amarok/2.3.0/src/amarok-2.3.0.tar.bz2; + sha256 = "1a2c6qy2ik9l7r1lxm82h49acvzxsxxlnlgzwhlrhi27p3sk0xpw"; }; inherit mysql loudmouth; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; From c80ae6de3a20481e10cc1af058d7460831b1f8d7 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Tue, 23 Mar 2010 22:35:58 +0000 Subject: [PATCH 092/313] update to 0.11.2a svn path=/nixpkgs/trunk/; revision=20800 --- pkgs/desktops/kde-4.4/extragear/kmplayer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.4/extragear/kmplayer/default.nix b/pkgs/desktops/kde-4.4/extragear/kmplayer/default.nix index 9d92f149325..51ae56cc8e4 100644 --- a/pkgs/desktops/kde-4.4/extragear/kmplayer/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/kmplayer/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kmplayer-0.11.1b"; + name = "kmplayer-0.11.2a"; src = fetchurl { - url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.1b.tar.bz2; - sha256 = "04wzxxa83kxfzpsrllbdgl0kd6jj13kzhdkm2w66s7mpylr88lfi"; + url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2a.tar.bz2; + sha256 = "1ddrghwsz11nhdxkca7jz0q2z1ajdb47n325h32jp5q7rm2qz80k"; }; builder = ./builder.sh; buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ]; From 60b8b2b6139c60cbc3c019a6bed377ccf862cde8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 23 Mar 2010 22:40:46 +0000 Subject: [PATCH 093/313] Adding pngnq. svn path=/nixpkgs/trunk/; revision=20801 --- pkgs/tools/graphics/pngnq/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/graphics/pngnq/default.nix diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/tools/graphics/pngnq/default.nix new file mode 100644 index 00000000000..d1b1cfad00d --- /dev/null +++ b/pkgs/tools/graphics/pngnq/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, libpng }: + +stdenv.mkDerivation rec { + name = "pngnq-1.0"; + + src = fetchurl { + url = "mirror://sourceforge/pngnq/${name}.tar.gz"; + sha256 = "19q07hlhr9p5d0wqgzyrcxdnqlczdwpiibcji0k2a6jfmxrcn4rl"; + }; + + buildInputs = [ libpng ]; + + meta = { + homepage = http://pngnq.sourceforge.net/; + description = "A PNG quantizer"; + license = "bsd"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 598cdf01776..3167e55c142 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1356,6 +1356,10 @@ let inherit fetchurl stdenv libpng; }; + pngnq = import ../tools/graphics/pngnq { + inherit fetchurl stdenv libpng; + }; + povray = import ../tools/graphics/povray { inherit fetchurl stdenv; }; From a991201bf56e3904d267d6e453f9ee0f03017a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 23 Mar 2010 23:04:41 +0000 Subject: [PATCH 094/313] Adding optipng, and a basic expression for pdfread. svn path=/nixpkgs/trunk/; revision=20802 --- pkgs/tools/graphics/optipng/default.nix | 18 ++++++++++ pkgs/tools/graphics/pdfread/default.nix | 48 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 9 +++++ 3 files changed, 75 insertions(+) create mode 100644 pkgs/tools/graphics/optipng/default.nix create mode 100644 pkgs/tools/graphics/pdfread/default.nix diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix new file mode 100644 index 00000000000..76305a343e6 --- /dev/null +++ b/pkgs/tools/graphics/optipng/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +# This package comes with its own copy of zlib, libpng and pngxtern + +stdenv.mkDerivation rec { + name = "optipng-0.6.4"; + + src = fetchurl { + url = "mirror://sourceforge/optipng/${name}.tar.gz"; + sha256 = "0ivnm07zlww20i7dba0zk5dyg8f3hlj03j7vazq520r43lmqj01h"; + }; + + meta = { + homepage = http://optipng.sourceforge.net/; + description = "A PNG optimizer"; + license = "bsd"; + }; +} diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix new file mode 100644 index 00000000000..1fc14445bbd --- /dev/null +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -0,0 +1,48 @@ +{stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pil, djvulibre +, optipng, unrar}: + +stdenv.mkDerivation { + name = "pdfread-1.8.2"; + + src = fetchurl { + # I got it from http://www.mobileread.com/forums/showthread.php?t=21906 + # But that needs user registration to allow downloading. + # This is an evolution from pdfread 1.7 in http://pdfread.sourceforge.net/ + # Temporary place: + url = http://vicerveza.homeunix.net/~viric/soft/PDFRead-1.8.2-Source-noGUI-noInstaller.zip; + sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an"; + }; + + buildInputs = [ unzip python makeWrapper ]; + + phases = "unpackPhase patchPhase installPhase"; + + unpackPhase = '' + unzip $src + sourceRoot=`pwd`/PDFRead/src + ''; + + patchPhase = '' + sed -i 's,#!/usr.*,#!${python}/bin/python,' pdfread.py + ''; + + installPhase = '' + ensureDir $out/bin + cp pdfread.py $out/bin + chmod +x $out/bin/pdfread.py + + LIBSUFFIX=lib/${python.libPrefix}/site-packages/ + PYDIR=$out/$LIBSUFFIX + ensureDir $PYDIR + cp -R *.py pylrs $PYDIR + + wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pil}/$LIBSUFFIX/PIL:$PYDIR \ + --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre}/bin:${unrar}/bin:${optipng}/bin + ''; + + meta = { + description = "PDF/DJVU to ebook format converter"; + homepage = http://www.mobileread.com/forums/showthread.php?t=21906; + license = "bsd"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3167e55c142..6545674a7de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1275,6 +1275,10 @@ let inherit fetchurl stdenv iproute lzo openssl nettools; }; + optipng = import ../tools/graphics/optipng { + inherit fetchurl stdenv; + }; + p7zip = import ../tools/archivers/p7zip { inherit fetchurl stdenv; }; @@ -1318,6 +1322,11 @@ let inherit fetchurl stdenv; }; + pdfread = import ../tools/graphics/pdfread { + inherit stdenv fetchurl unzip python makeWrapper ghostscript pngnq pil + djvulibre unrar optipng; + }; + pg_top = import ../tools/misc/pg_top { inherit fetchurl stdenv ncurses postgresql; }; From 37cba95518a5de2611730b77efcf9f8dad56b3b9 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Tue, 23 Mar 2010 23:10:55 +0000 Subject: [PATCH 095/313] update to 1.1.0 svn path=/nixpkgs/trunk/; revision=20803 --- pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix b/pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix index 59b77866800..188e9df8874 100644 --- a/pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix @@ -2,11 +2,11 @@ kdegraphics, kdepimlibs, libxml2, libxslt, gettext}: stdenv.mkDerivation rec { - name = "kipi-plugins-1.0.0"; + name = "kipi-plugins-1.1.0"; src = fetchurl { url = "mirror://sourceforge/kipi/${name}.tar.bz2"; - sha256 = "1fmjxl41lvyb6zv8wrg8sz0hb1jjynj2pwisynpbffglnxd09fwf"; + sha256 = "0vclb906g2jgzfl9f2qapaxcqq412j01yn7686682xx8iwrxm2cy"; }; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs From 7a57a42ee6155d1379cace767ba7758f755ef702 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 24 Mar 2010 07:25:33 +0000 Subject: [PATCH 096/313] Update XNeur svn path=/nixpkgs/trunk/; revision=20804 --- pkgs/applications/misc/xneur/src-for-default.nix | 8 ++++---- pkgs/applications/misc/xneur/src-info-for-default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/xneur/src-for-default.nix b/pkgs/applications/misc/xneur/src-for-default.nix index 71090a58b52..3ea03746f81 100644 --- a/pkgs/applications/misc/xneur/src-for-default.nix +++ b/pkgs/applications/misc/xneur/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.9.6"; - name="xneur-0.9.6"; - hash="0xxyj2w5ckk2pnqsx853zgs6s2lq1cb101px472rccpixcbdfs47"; + version="0.9.8"; + name="xneur-0.9.8"; + hash="11xpw5vj4yccyq54jnx63kv6lkxa3fqr3kjncmgdc8xqk1pa7jmd"; url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2"; - advertisedUrl="http://dists.xneur.ru/release-0.9.6/tgz/xneur-0.9.6.tar.bz2"; + advertisedUrl="http://dists.xneur.ru/release-0.9.8/tgz/xneur-0.9.8.tar.bz2"; } diff --git a/pkgs/applications/misc/xneur/src-info-for-default.nix b/pkgs/applications/misc/xneur/src-info-for-default.nix index b0788bc641c..0de3e83baf7 100644 --- a/pkgs/applications/misc/xneur/src-info-for-default.nix +++ b/pkgs/applications/misc/xneur/src-info-for-default.nix @@ -1,5 +1,5 @@ { - downloadPage = "http://xneur.ru/wiki/Downloads"; + downloadPage = "http://xneur.ru/downloads"; baseName = "xneur"; versionReferenceCreator = "$(replaceAllVersionOccurences)"; } From 08af6b60c07fa99d0f58cdfe1252d39055648b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 24 Mar 2010 12:04:27 +0000 Subject: [PATCH 097/313] Trying to fix qt's openssl. The change I had done for qt-4.5 was not in qt-4.6. I just copied that to qt-4.6, expecting it to work. svn path=/nixpkgs/trunk/; revision=20806 --- pkgs/development/libraries/qt-4.6/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/qt-4.6/default.nix b/pkgs/development/libraries/qt-4.6/default.nix index 8f0746a59cc..0a83cc9e4a5 100644 --- a/pkgs/development/libraries/qt-4.6/default.nix +++ b/pkgs/development/libraries/qt-4.6/default.nix @@ -47,6 +47,11 @@ stdenv.mkDerivation { glib libtiff ]; + + # libQtNetwork will call libQtCore for it to dlopen openssl. + NIX_LDFLAGS = "-rpath ${openssl}/lib"; + # Don't shrink the rpath, to keep ${openssl} in it. + dontPatchELF = 1; prefixKey = "-prefix "; From 09e05eb46afcf360c4a4f42da077e0e73e11e48c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 25 Mar 2010 07:55:11 +0000 Subject: [PATCH 098/313] Update wine svn path=/nixpkgs/trunk/; revision=20816 --- pkgs/misc/emulators/wine/src-for-default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/wine/src-for-default.nix b/pkgs/misc/emulators/wine/src-for-default.nix index 48ecc4f27e3..1f01b17f40e 100644 --- a/pkgs/misc/emulators/wine/src-for-default.nix +++ b/pkgs/misc/emulators/wine/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.1.36"; - name="wine-1.1.36"; - hash="0b22w68w7z4in21xy286yddix6sf4jna919z2lw2p9hxsgzvhlwk"; + version="1.1.41"; + name="wine-1.1.41"; + hash="0zlvyw1kaf5zn5qacjgxwig40v056rqj9wdi505hlf3qqcz1b0ff"; url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2"; - advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.1.36.tar.bz2"; + advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.1.41.tar.bz2"; } From 806099dbc85716cd50d9d633488df970bd6e5eb1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 25 Mar 2010 11:51:55 +0000 Subject: [PATCH 099/313] * Added GNU wdiff. svn path=/nixpkgs/trunk/; revision=20817 --- pkgs/tools/text/wdiff/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/text/wdiff/default.nix diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix new file mode 100644 index 00000000000..da1ff92add3 --- /dev/null +++ b/pkgs/tools/text/wdiff/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "wdiff-0.5.95"; + + src = fetchurl { + url = "http://alpha.gnu.org/gnu/wdiff/${name}.tar.gz"; + sha256 = "1rha2x8b6i0gk9s2gp61x4acakkx5q9ar1k54x9grmgr6w7fzd97"; + }; + + meta = { + homepage = http://www.gnu.org/software/wdiff/; + description = "A front-end to diff for comparing files on a word per word basis"; + license = "GPLv3"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6545674a7de..1ec13e701f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1778,6 +1778,10 @@ let inherit stdenv fetchurl neon fuse pkgconfig glib; }; + wdiff = import ../tools/text/wdiff { + inherit fetchurl stdenv; + }; + webalizer = import ../tools/networking/webalizer { inherit stdenv fetchurl zlib libpng gd db4 geoip; }; From a838f246087a5d5b9b23ed7ddb217d1d65f8439a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 25 Mar 2010 13:36:42 +0000 Subject: [PATCH 100/313] Updating and trying to fix the build for pycups svn path=/nixpkgs/trunk/; revision=20823 --- pkgs/development/python-modules/pycups/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix index ad17b5b0b0b..18de5fbe7f1 100644 --- a/pkgs/development/python-modules/pycups/default.nix +++ b/pkgs/development/python-modules/pycups/default.nix @@ -1,11 +1,17 @@ {stdenv, fetchurl, python, cups}: +let + version = "1.9.49"; +in stdenv.mkDerivation { - name = "pycups-1.9.48"; + name = "pycups-${version}"; src = fetchurl { - url = http://cyberelk.net/tim/data/pycups/pycups-1.9.48.tar.bz2; - sha256 = "11cz6pqp18wxrzpix55pin97mfcmdc4g13zpr739glb6c9mnj7qp"; + url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2"; + sha256 = "1gpp28sknjw5z4mzhaifc6hkfrlbm2y6w870q47ia8amnm05d3pk"; }; - installPhase = "python ./setup.py install --prefix $out"; + buildPhase = ""; + installPhase = '' + CFLAGS=-DVERSION=\\\"${version}\\\" python ./setup.py install --prefix $out + ''; buildInputs = [ python cups ]; } From d533e313574aa581e42fa184ff51e2b970170e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 25 Mar 2010 15:07:53 +0000 Subject: [PATCH 101/313] Updating gtkwave svn path=/nixpkgs/trunk/; revision=20825 --- pkgs/applications/science/electronics/gtkwave/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 1630303c603..ca1be9a8b41 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,13 +1,13 @@ -{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2} : +{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz} : stdenv.mkDerivation rec { - name = "gtkwave-3.3.2"; + name = "gtkwave-3.3.5"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "0dccyyzk963v5nz6hxfvkcnfwm98m8d8s5x0nw6459r9683pdlri"; + sha256 = "0vll02l3g990spc7yzwl16lbw18ybm7s9j3ffjq2v7949wng43l9"; }; - buildInputs = [ gtk gperf pkgconfig bzip2 ]; + buildInputs = [ gtk gperf pkgconfig bzip2 xz ]; meta = { description = "Wave viewer for Unix and Win32"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ec13e701f6..f98c194d635 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8925,7 +8925,7 @@ let }; gtkwave = import ../applications/science/electronics/gtkwave { - inherit fetchurl stdenv gperf pkgconfig bzip2; + inherit fetchurl stdenv gperf pkgconfig bzip2 xz; inherit (gtkLibs) gtk; }; From 25ea790dd497a09381c3d125e7b616086ad608f9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 25 Mar 2010 19:40:19 +0000 Subject: [PATCH 102/313] * Added the Dutch Tax Return program for 2009. svn path=/nixpkgs/trunk/; revision=20828 --- .../taxes/aangifte-2009/default.nix | 33 +++++++++++ pkgs/top-level/all-packages.nix | 56 +++++++++---------- 2 files changed, 61 insertions(+), 28 deletions(-) create mode 100644 pkgs/applications/taxes/aangifte-2009/default.nix diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix new file mode 100644 index 00000000000..6d52783a641 --- /dev/null +++ b/pkgs/applications/taxes/aangifte-2009/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, libX11, libXext, libSM }: + +stdenv.mkDerivation { + name = "aangifte2009-1"; + + src = fetchurl { + url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2009_linux.tar.gz; + sha256 = "07l83cknzxwlzmg1w6baf2wqs06bh8v3949n51hy1p3wgr8hf408"; + }; + + dontStrip = true; + + buildPhase = + '' + for i in bin/*; do + patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + $i + done + ''; + + installPhase = + '' + ensureDir $out + cp -prvd * $out/ + ''; + + meta = { + description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)"; + url = http://www.belastingdienst.nl/particulier/aangifte2009/download/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f98c194d635..baeb0ba6eee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -43,7 +43,7 @@ let config_ = config; in # rename the function argument let - lib = import ../lib; # see also libTests below + lib = import ../lib; # The contents of the configuration file found at $NIXPKGS_CONFIG or # $HOME/.nixpkgs/config.nix. @@ -106,13 +106,13 @@ let # The package compositions. Yes, this isn't properly indented. pkgsFun = __overrides: with helperFunctions; rec { - # override system. This is useful to build i686 packages on x86_64-linux + # Override system. This is useful to build i686 packages on x86_64-linux. forceSystem = system: (import ./all-packages.nix) { inherit system; inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config; }; - # used by wine, firefox with debugging version of Flash, .. + # Used by wine, firefox with debugging version of Flash, ... pkgsi686Linux = forceSystem "i686-linux"; inherit __overrides; @@ -6715,23 +6715,28 @@ let aangifte2005 = import ../applications/taxes/aangifte-2005 { - inherit stdenv fetchurl; - inherit (xlibs) libX11 libXext; + inherit (pkgsi686Linux) stdenv fetchurl; + inherit (pkgsi686Linux.xlibs) libX11 libXext; }; aangifte2006 = import ../applications/taxes/aangifte-2006 { - inherit stdenv fetchurl; - inherit (xlibs) libX11 libXext; + inherit (pkgsi686Linux) stdenv fetchurl; + inherit (pkgsi686Linux.xlibs) libX11 libXext; }; aangifte2007 = import ../applications/taxes/aangifte-2007 { - inherit stdenv fetchurl; - inherit (xlibs) libX11 libXext libSM; + inherit (pkgsi686Linux) stdenv fetchurl; + inherit (pkgsi686Linux.xlibs) libX11 libXext libSM; }; aangifte2008 = import ../applications/taxes/aangifte-2008 { - inherit stdenv fetchurl; - inherit (xlibs) libX11 libXext libSM; + inherit (pkgsi686Linux) stdenv fetchurl; + inherit (pkgsi686Linux.xlibs) libX11 libXext libSM; + }; + + aangifte2009 = import ../applications/taxes/aangifte-2009 { + inherit (pkgsi686Linux) stdenv fetchurl; + inherit (pkgsi686Linux.xlibs) libX11 libXext libSM; }; abcde = import ../applications/audio/abcde { @@ -9274,25 +9279,20 @@ let inherit (pythonPackages) pysqlite; }; - vice = import ../misc/emulators/vice { - inherit stdenv fetchurl lib perl gettext libpng giflib libjpeg alsaLib readline mesa; - inherit pkgconfig SDL makeDesktopItem autoconf automake; - inherit (gtkLibs) gtk; - }; + vice = import ../misc/emulators/vice { + inherit stdenv fetchurl lib perl gettext libpng giflib libjpeg alsaLib readline mesa; + inherit pkgconfig SDL makeDesktopItem autoconf automake; + inherit (gtkLibs) gtk; + }; wine = - if system == "x86_64-linux" then - # Can't build this in 64-bit; use a 32-bit build instead. - pkgsi686Linux.wine - # some hackery to make nix-env show this package on x86_64... - // {system = "x86_64-linux";} - else - import ../misc/emulators/wine { - inherit fetchurl stdenv bison mesa ncurses - libpng libjpeg alsaLib lcms xlibs freetype - fontconfig fontforge libxml2 libxslt openssl; - flex = flex2535; - }; + # Wine cannot be built in 64-bit; use a 32-bit build instead. + import ../misc/emulators/wine { + inherit (pkgsi686Linux) fetchurl stdenv bison mesa ncurses + libpng libjpeg alsaLib lcms xlibs freetype + fontconfig fontforge libxml2 libxslt openssl; + flex = pkgsi686Linux.flex2535; + }; xosd = import ../misc/xosd { inherit fetchurl stdenv; From 48e1c2df80d9f750bc68be9e4d50cd6b19f07437 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 25 Mar 2010 19:48:06 +0000 Subject: [PATCH 103/313] * Added xdg-utils, a package that contains desktop integration commands such as `xdg-open' (which opens a URL with the user's default browser). svn path=/nixpkgs/trunk/; revision=20829 --- pkgs/tools/X11/xdg-utils/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/X11/xdg-utils/default.nix diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix new file mode 100644 index 00000000000..cc166ba20d9 --- /dev/null +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "xdg-utils-1.0.2"; + + src = fetchurl { + url = "http://portland.freedesktop.org/download/${name}.tgz"; + sha256 = "1b019d3r1379b60p33d6z44kx589xjgga62ijz9vha95dg8vgbi1"; + }; + + meta = { + homepage = http://portland.freedesktop.org/wiki/; + description = "A set of command line tools that assist applications with a variety of desktop integration tasks"; + license = "free"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index baeb0ba6eee..280aaeb9405 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8404,6 +8404,10 @@ let inherit (xlibs) libXcomposite libXfixes libXdamage libXrender; }; + xdg_utils = import ../tools/X11/xdg-utils { + inherit stdenv fetchurl; + }; + /* Doesn't work yet xen = builderDefsPackage (import ../applications/virtualization/xen) { From 54aefa41b4547890dbebdf85b75a620188ee138f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 25 Mar 2010 20:39:01 +0000 Subject: [PATCH 104/313] * aangifte2009 requires xdg-utils to open a browser. svn path=/nixpkgs/trunk/; revision=20830 --- pkgs/applications/taxes/aangifte-2009/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix index 6d52783a641..231670d263b 100644 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ b/pkgs/applications/taxes/aangifte-2009/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXext, libSM }: +{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: stdenv.mkDerivation { name = "aangifte2009-1"; @@ -9,6 +9,9 @@ stdenv.mkDerivation { }; dontStrip = true; + dontPatchELF = true; + + buildInputs = [ makeWrapper ]; buildPhase = '' @@ -24,6 +27,7 @@ stdenv.mkDerivation { '' ensureDir $out cp -prvd * $out/ + wrapProgram $out/bin/ib2009ux --prefix PATH : ${xdg_utils}/bin ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 280aaeb9405..948e10357bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6735,7 +6735,7 @@ let }; aangifte2009 = import ../applications/taxes/aangifte-2009 { - inherit (pkgsi686Linux) stdenv fetchurl; + inherit (pkgsi686Linux) stdenv fetchurl makeWrapper xdg_utils; inherit (pkgsi686Linux.xlibs) libX11 libXext libSM; }; From 4003f1e6fe51418d7b7e2b10bc1e61afef5ccbed Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 26 Mar 2010 13:31:11 +0000 Subject: [PATCH 105/313] nixpkgs: for darwin redirect jdk to openjdk svn path=/nixpkgs/trunk/; revision=20832 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 948e10357bd..f2cbd969d2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2327,7 +2327,7 @@ let inherit fetchurl stdenv unzip; }); - jdk = jdkdistro true false; + jdk = if stdenv.isDarwin then openjdkDarwin else jdkdistro true false; jre = jdkdistro false false; jdkPlugin = jdkdistro true true; From e6ad0bd25efad02e635b0f015de2559d7fb90215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 27 Mar 2010 17:40:05 +0000 Subject: [PATCH 106/313] Updating gnused 4.2 svn path=/nixpkgs/trunk/; revision=20837 --- pkgs/tools/text/gnused/4.2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/gnused/4.2.nix b/pkgs/tools/text/gnused/4.2.nix index 76e943b216e..7a75f50d122 100644 --- a/pkgs/tools/text/gnused/4.2.nix +++ b/pkgs/tools/text/gnused/4.2.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "gnused-4.2"; + name = "gnused-4.2.1"; src = fetchurl { - url = "mirror://gnu/sed/sed-4.2.tar.bz2"; - sha256 = "1j25icv75rnc0r1b9hv2164rcnnn7ba4zx5xrvp7v3h3mgimaxzf"; + url = "mirror://gnu/sed/sed-4.2.1.tar.bz2"; + sha256 = "13wlsb4sf5d5a82xjhxqmdvrrn36rmw5f0pl9qyb9zkvldnb7hra"; }; doCheck = true; From 99f19e27de8e2c1f0edfb82406013633526fc672 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sun, 28 Mar 2010 00:06:30 +0000 Subject: [PATCH 107/313] applications/networking/p2p/transmission: New nixpkg. svn path=/nixpkgs/trunk/; revision=20840 --- .../networking/p2p/transmission/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/networking/p2p/transmission/default.nix diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix new file mode 100644 index 00000000000..1ef88f56010 --- /dev/null +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, gtkClient ? true, gtk }: +stdenv.mkDerivation rec { + name = "transmission-1.92"; + src = fetchurl { + url = "http://mirrors.m0k.org/transmission/files/${name}.tar.bz2"; + sha256 = "1vdvl3aza5cip4skhd2y4ip2vjci7q3y3qi3008ykk28ga93gw6s"; + }; + buildInputs = [ pkgconfig openssl curl intltool ] ++ stdenv.lib.optional gtkClient gtk; + configureFlags = if gtkClient then "--enable-gtk" else "--disable-gtk"; + meta = { + description = "A fast, easy and free BitTorrent client."; + longDescription = '' + Transmission is a BitTorrent client which features a simple interface + on top of a cross-platform back-end. + Feature spotlight: + * Uses fewer resources than other clients + * Native Mac, GTK+ and Qt GUI clients + * Daemon ideal for servers, embedded systems, and headless use + * All these can be remote controlled by Web and Terminal clients + * Bluetack (PeerGuardian) blocklists with automatic updates + * Full encryption, DHT, and PEX support + ''; + homepage = http://www.transmissionbt.com/; + license = [ "GPLv2" ]; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2cbd969d2b..ecc2642b403 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8229,6 +8229,11 @@ let inherit fetchurl stdenv diffutils gnutar gnupatch which; }; + transmission = import ../applications/networking/p2p/transmission { + inherit stdenv fetchurl pkgconfig openssl curl intltool; + inherit (gtkLibs) gtk; + }; + twinkle = import ../applications/networking/twinkle { inherit fetchurl stdenv lib pkgconfig commoncpp2 ccrtp openssl speex libjpeg perl libzrtpcpp libsndfile libxml2 file readline alsaLib; From acb93ad6384327921fe79c6b9c5c679f581c6c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 28 Mar 2010 19:18:12 +0000 Subject: [PATCH 108/313] Updating ikiwiki svn path=/nixpkgs/trunk/; revision=20844 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index bda42123a35..56388e641e4 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "ikiwiki_3.20100102.3"; + name = "ikiwiki_3.20100312"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}.tar.gz"; - sha256 = "0vb54z7hwb6iwd0j96vhr8ypzwc8l4hd98wbp5wsxkx5bgc38nsp"; + sha256 = "1pzjl4iplizzspsl237996j1ma6yp9jagbqf3d43kbhv1ai0v3ci"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate From 946ca821732f14897f37791f0b4f4825336bf723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 28 Mar 2010 22:54:10 +0000 Subject: [PATCH 109/313] Making ikiwiki happier with LocaleGettext svn path=/nixpkgs/trunk/; revision=20845 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 56388e641e4..a05668d246f 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, perl, gettext, makeWrapper, lib, TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate, - CGISession, CGIFormBuilder, DBFile + CGISession, CGIFormBuilder, DBFile, LocaleGettext , git ? null , monotone ? null , extraUtils ? [] @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate - TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder ] + TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext ] ++ (lib.optional (monotone != null) monotone) ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecc2642b403..d43741cc402 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7580,7 +7580,7 @@ let ikiwiki = makeOverridable (import ../applications/misc/ikiwiki) { inherit fetchurl stdenv perl gettext makeWrapper lib; inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber - HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder; + HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext; inherit git; # The RCS should be optional monotone = null; extraUtils = []; From c121776718ee7a094b69a330961549dee5d92022 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Mon, 29 Mar 2010 17:38:23 +0000 Subject: [PATCH 110/313] update to 1.2.0 svn path=/nixpkgs/trunk/; revision=20860 --- pkgs/desktops/kde-4.4/extragear/digikam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix b/pkgs/desktops/kde-4.4/extragear/digikam/default.nix index 39f30106528..e1d2f2864c6 100644 --- a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/digikam/default.nix @@ -2,11 +2,11 @@ kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext}: stdenv.mkDerivation rec { - name = "digikam-1.1.0"; + name = "digikam-1.2.0"; src = fetchurl { url = "mirror://sourceforge/digikam/${name}.tar.bz2"; - sha256 = "13zs5gwrzmqcx29r4vn96csz5hivycczjpa5l1157f5xhcg949kd"; + sha256 = "01hjcdm3l5rxz8wb7rvsplysy8hw2b3hcggg9dgk9bskpfskj1ck"; }; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen From 01b602c7f4ca3e5f12282d36e682d44ed4b9a525 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Mon, 29 Mar 2010 23:36:25 +0000 Subject: [PATCH 111/313] update Scala 2.7.7 patch provided by Francois Perrad I readded license line svn path=/nixpkgs/trunk/; revision=20861 --- pkgs/development/compilers/scala/default.nix | 22 +++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 6dacef9c1c0..3f824786119 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,22 +1,34 @@ args: with args; +# at runtime, need jre or jdk + stdenv.mkDerivation rec { - name = "scala-2.7.1"; + name = "scala-2.7.7"; src = fetchurl { - url = "http://www.scala-lang.org/downloads/distrib/files/${name}.final.tar.gz"; - sha256 = "3cad113ed7b84f4f009897f6066bee28459e63a1cf1a6d5d56f10f4d1f9819ec"; + url = "http://www.scala-lang.org/downloads/distrib/files/${name}.final.tgz"; + md5 = "5d2294d5aab72fec869c0ba666d28b7e"; }; installPhase = '' - mkdir -p $out + ensureDir $out + rm bin/*.bat mv * $out - rm -f $out/bin/*.bat ''; phases = "unpackPhase installPhase"; meta = { description = "Scala is a general purpose programming language"; + longDescription = '' + Scala is a general purpose programming language designed to express + common programming patterns in a concise, elegant, and type-safe way. + It smoothly integrates features of object-oriented and functional + languages, enabling Java and other programmers to be more productive. + Code sizes are typically reduced by a factor of two to three when + compared to an equivalent Java application. + ''; + homepage = http://www.scala-lang.org/; + license = "BSD"; }; } From 7b5896ca33bc1d16329e7335182f0e22a064fadf Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Mon, 29 Mar 2010 23:36:32 +0000 Subject: [PATCH 112/313] add Groovy 1.7.1 patch provided by Francois Perrad svn path=/nixpkgs/trunk/; revision=20862 --- .../interpreters/groovy/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/interpreters/groovy/default.nix diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix new file mode 100644 index 00000000000..b7dc135215c --- /dev/null +++ b/pkgs/development/interpreters/groovy/default.nix @@ -0,0 +1,27 @@ +args: with args; + +# at runtime, need jdk + +stdenv.mkDerivation rec { + name = "groovy-1.7.1"; + + src = fetchurl { + url = "http://dist.groovy.codehaus.org/distributions/groovy-binary-1.7.1.zip"; + sha256 = "0a204f6835f07e6a079bd4761e70cd5e0c31ebc0c9eb293fda11dfb2d8bf137c"; + }; + + installPhase = '' + ensureDir $out + rm bin/*.bat + mv * $out + ''; + + phases = "unpackPhase installPhase"; + + buildInputs = [unzip]; + + meta = { + description = "An agile dynamic language for the Java Platform"; + homepage = http://groovy.codehaus.org/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d43741cc402..225d1e2d11a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2553,6 +2553,10 @@ let inherit fetchurl stdenv perl gnum4 ncurses openssl; }; + groovy = import ../development/interpreters/groovy { + inherit stdenv fetchurl unzip; + }; + guile = import ../development/interpreters/guile { inherit fetchurl stdenv readline libtool gmp gawk makeWrapper; }; From 1d5910bb9470b3aeade5db8dbf7490cfb1b1fb2d Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Mon, 29 Mar 2010 23:36:35 +0000 Subject: [PATCH 113/313] add Gradle 0.8 patch provided by Francois Perrad svn path=/nixpkgs/trunk/; revision=20863 --- .../tools/build-managers/gradle/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/tools/build-managers/gradle/default.nix diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix new file mode 100644 index 00000000000..227759fa959 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -0,0 +1,36 @@ +args: with args; + +# at runtime, need jdk + +stdenv.mkDerivation rec { + name = "gradle-0.8"; + + src = fetchurl { + url = "http://dist.codehaus.org/gradle/gradle-0.8-bin.zip"; + sha256 = "940e623ea98e40ea9ad398770a6ebb91a61c0869d394dda81aa86b0f4f0025e7"; + }; + + installPhase = '' + ensureDir $out + rm bin/*.bat + mv * $out + ''; + + phases = "unpackPhase installPhase"; + + buildInputs = [unzip]; + + meta = { + description = "Gradle is an enterprise-grade build system"; + longDescription = '' + Gradle is a build system which offers you ease, power and freedom. + You can choose the balance for yourself. It has powerful multi-project + build support. It has a layer on top of Ivy that provides a + build-by-convention integration for Ivy. It gives you always the choice + between the flexibility of Ant and the convenience of a + build-by-convention behavior. + ''; + homepage = http://www.gradle.org/; + license = "ASL2.0"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 225d1e2d11a..654a91f5efe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3080,6 +3080,10 @@ let inherit fetchurl stdenv; }; + gradle = import ../development/tools/build-managers/gradle { + inherit stdenv fetchurl unzip; + }; + gperf = import ../development/tools/misc/gperf { inherit fetchurl stdenv; }; From ec095c91455f844d0e3c090720c44a4aaaf894b7 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Mon, 29 Mar 2010 23:36:38 +0000 Subject: [PATCH 114/313] add ack-1.92 patch provided by Francois Perrad svn path=/nixpkgs/trunk/; revision=20864 --- pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/perl-packages.nix | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 654a91f5efe..1510cc4d18e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5306,6 +5306,7 @@ let perlXMLParser = perlPackages.XMLParser; + ack = perlPackages.ack; ### DEVELOPMENT / PYTHON MODULES diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5afb4415593..575fbfe07c9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11,6 +11,23 @@ rec { inherit (pkgs) buildPerlPackage fetchurl stdenv perl; + ack = buildPerlPackage rec { + name = "ack-1.92"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; + sha256 = "8689156cb0639ff60adee47fc4b77e656cf0fc58e6c123ee6c481d9d48e99b88"; + }; + propagatedBuildInputs = [ FileNext ]; + meta = { + description = "grep-like text finder"; + longDescription = '' + ack is a grep-like tool tailored to working with large trees of source code. + ''; + homepage = http://betterthangrep.com/; + license = "free"; # Artistic 2.0 + }; + }; + AlgorithmAnnotate = buildPerlPackage { name = "Algorithm-Annotate-0.10"; src = fetchurl { @@ -1100,6 +1117,14 @@ rec { }; }; + FileNext = buildPerlPackage rec { + name = "File-Next-1.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; + sha256 = "36cc0a4e5e4e44e04f7bea6f7453db517acc1a1b35a2b5fe5bc14cea0f560662"; + }; + }; + FileShareDir = buildPerlPackage rec { name = "File-ShareDir-1.00"; src = fetchurl { From 3a94c410d164d6a3cb28b1b4b6fcaa9abc347831 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Mon, 29 Mar 2010 23:36:40 +0000 Subject: [PATCH 115/313] add perlcritic 1.105 (and Test::Perl::Critic 1.02) and some depndencies: total perl libs added: BKeywords ConfigTiny ExceptionClass FileRemove FileWhich HookLexWrap IOString IPCRun3 PerlCritic PerlTidy PPI PodSpell ProbePerl ReadonlyXS RegexpParser StringFormat TestObject TestPerlCritic TestScript TestSubCalls patch provided by Francois Perrad svn path=/nixpkgs/trunk/; revision=20865 --- pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/perl-packages.nix | 185 ++++++++++++++++++++++++++++++- 2 files changed, 185 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1510cc4d18e..2230cc3024c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5308,6 +5308,8 @@ let ack = perlPackages.ack; + perlcritic = perlPackages.PerlCritic; + ### DEVELOPMENT / PYTHON MODULES buildPythonPackage = diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 575fbfe07c9..bb455efa790 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -150,6 +150,14 @@ rec { propagatedBuildInputs = [CarpClan]; }; + BKeywords = buildPerlPackage rec { + name = "B-Keywords-1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JJ/JJORE/${name}.tar.gz"; + sha256 = "9a231f54a01a705c574a38702cb3fe8bbb301ea7357a09797e3da876a265d395"; + }; + }; + Boolean = buildPerlPackage rec { name = "boolean-0.20"; src = fetchurl { @@ -671,6 +679,14 @@ rec { }; }; + ConfigTiny = buildPerlPackage rec { + name = "Config-Tiny-2.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "1a5b7f5e8245a3e7be859df571209353be30abc7292815ee0f459b8dc87cdb5b"; + }; + }; + constant = buildPerlPackage { name = "constant-1.15"; src = fetchurl { @@ -1057,6 +1073,15 @@ rec { }; }; + ExceptionClass = buildPerlPackage rec { + name = "Exception-Class-1.30"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + sha256 = "54e256fdb317c1736c2c257fa63d5b87cfb382870711b24937c36eb5171b3154"; + }; + propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ]; + }; + ExtUtilsInstall = buildPerlPackage { name = "ExtUtils-Install-1.50"; src = fetchurl { @@ -1125,6 +1150,14 @@ rec { }; }; + FileRemove = buildPerlPackage rec { + name = "File-Remove-1.42"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "2ec2643c4e1a721965ed70ce184b72ae831c82b577420612a59eba8a0ce2a504"; + }; + }; + FileShareDir = buildPerlPackage rec { name = "File-ShareDir-1.00"; src = fetchurl { @@ -1150,6 +1183,15 @@ rec { }; }; + FileWhich = buildPerlPackage rec { + name = "File-Which-1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "b72fec6590160737cba97293c094962adf4f7d44d9e68dde7062ecec13f4b2c3"; + }; + propagatedBuildInputs = [ TestScript ]; + }; + FreezeThaw = buildPerlPackage { name = "FreezeThaw-0.43"; src = fetchurl { @@ -1176,6 +1218,15 @@ rec { }; }; + HookLexWrap = buildPerlPackage rec { + name = "Hook-LexWrap-0.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHORNY/${name}.zip"; + sha256 = "eda90ba26f8a0cef02d38f08a1786a203beec1309279493c78eed13567d0fa7e"; + }; + buildInputs = [ pkgs.unzip ]; + }; + HTMLFormFu = buildPerlPackage rec { name = "HTML-FormFu-0.03007"; src = fetchurl { @@ -1364,6 +1415,14 @@ rec { }; }; + IOString = buildPerlPackage rec { + name = "IO-String-1.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; + sha256 = "2a3f4ad8442d9070780e58ef43722d19d1ee21a803bf7c8206877a10482de5a0"; + }; + }; + IPCRun = buildPerlPackage rec { name = "IPC-Run-0.82"; src = fetchurl { @@ -1373,6 +1432,14 @@ rec { doCheck = false; /* attempts a network connection to localhost */ }; + IPCRun3 = buildPerlPackage rec { + name = "IPC-Run3-0.043"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "96b534e07e1459529ac12a77393628366f30d122b0dfaaa3ed5ec032079097ad"; + }; + }; + ImageExifTool = buildPerlPackage rec { name = "Image-ExifTool-8.12"; @@ -1785,10 +1852,10 @@ rec { }; ParamsUtil = buildPerlPackage rec { - name = "Params-Util-0.37"; + name = "Params-Util-1.01"; src = fetchurl { url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "1n36vhahbs2mfck5x6g8ab9280zji9zwc5092jiq78s791227cb6"; + sha256 = "6a1613b669f18bf329003c7dbd11435248cffa9c1497645073821a68c0987a40"; }; }; @@ -1832,6 +1899,18 @@ rec { }; }; + PerlCritic = buildPerlPackage rec { + name = "Perl-Critic-1.105"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EL/ELLIOTJS/${name}.tar.gz"; + sha256 = "3e1bd5ab4912ebe20cd3cb81b36ee28dbdd8d410374a31025dc9fb289921ff27"; + }; + propagatedBuildInputs = [ + PPI BKeywords ConfigTiny ExceptionClass Readonly StringFormat + EmailAddress FileWhich PerlTidy PodSpell ReadonlyXS RegexpParser + ]; + }; + PerlIOeol = buildPerlPackage { name = "PerlIO-eol-0.14"; src = fetchurl { @@ -1856,6 +1935,33 @@ rec { }; }; + PerlTidy = buildPerlPackage rec { + name = "Perl-Tidy-20090616"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHANCOCK/${name}.tar.gz"; + sha256 = "c7ca21e287d23c769c235f6742fab7b5779b7c7bf58b6a55ba8cdc492e50a118"; + }; + }; + + PPI = buildPerlPackage rec { + name = "PPI-1.210"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "6c851e86475242fa0def2f02565743d41ab703ff6df3e826166ee9df5b961c7a"; + }; + propagatedBuildInputs = [ + ClassInspector + Clone + FileRemove + IOString + ListMoreUtils + ParamsUtil + TaskWeaken + TestNoWarnings TestObject TestSubCalls + ]; + doCheck = false; + }; + ModulePluggable = buildPerlPackage rec { name = "Module-Pluggable-3.9"; src = fetchurl { @@ -1919,6 +2025,22 @@ rec { propagatedBuildInputs = [constant PodEscapes]; }; + PodSpell = buildPerlPackage rec { + name = "Pod-Spell-1.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SB/SBURKE/${name}.tar.gz"; + sha256 = "938648dca5b62e591783347f9d4d4e2a5239f9629c6adfed9a581b9457ef7d2e"; + }; + }; + + ProbePerl = buildPerlPackage rec { + name = "Probe-Perl-0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KW/KWILLIAMS/${name}.tar.gz"; + sha256 = "9b7d211139e42b2a2952c9a4b9f55ac12705e256f4a0acd4ac6ff665aeaddd87"; + }; + }; + Readonly = buildPerlPackage rec { name = "Readonly-1.03"; src = fetchurl { @@ -1927,6 +2049,14 @@ rec { }; }; + ReadonlyXS = buildPerlPackage rec { + name = "Readonly-XS-1.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RO/ROODE/${name}.tar.gz"; + sha256 = "8ae5c4e85299e5c8bddd1b196f2eea38f00709e0dc0cb60454dc9114ae3fff0d"; + }; + }; + RegexpAssemble = buildPerlPackage rec { name = "Regexp-Assemble-0.34"; src = fetchurl { @@ -1951,6 +2081,14 @@ rec { }; }; + RegexpParser = buildPerlPackage rec { + name = "Regexp-Parser-0.20"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PI/PINYAN/${name}.tar.gz"; + sha256 = "0dfdbe060724396697303c5522e697679ab6e74151f3c3ef8df49f3bda30a2a5"; + }; + }; + ReturnValue = buildPerlPackage { name = "Return-Value-1.302"; src = fetchurl { @@ -2006,6 +2144,14 @@ rec { buildInputs = [TestPod TestPodCoverage]; }; + StringFormat = buildPerlPackage rec { + name = "String-Format-1.16"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DARREN/${name}.tar.gz"; + sha256 = "edb27dd055ad71012a439f262f9394517adb585a5c27ba72c1819bae2c23729a"; + }; + }; + StringMkPasswd = buildPerlPackage { name = "String-MkPasswd-0.02"; src = fetchurl { @@ -2242,6 +2388,23 @@ rec { propagatedBuildInputs = [TestTester]; }; + TestObject = buildPerlPackage rec { + name = "Test-Object-0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "d142a91b039928dc5d616c7bd9bb62ffb06e58991f00c54e26ef7e62ed61032a"; + }; + }; + + TestPerlCritic = buildPerlPackage rec { + name = "Test-Perl-Critic-1.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TH/THALJEF/${name}.tar.gz"; + sha256 = "89b242ff539034336ed87c11ef3e5ecac47c333a6ab8b46aab4cc449e3739a89"; + }; + propagatedBuildInputs = [ PerlCritic ]; + }; + TestPod = buildPerlPackage { name = "Test-Pod-1.26"; src = fetchurl { @@ -2268,6 +2431,24 @@ rec { propagatedBuildInputs = [TestHarness]; }; + TestScript = buildPerlPackage rec { + name = "Test-Script-1.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "e21e5ee43a27b4c51b54ded5c92e60b817309778117a1d98ae6354abff27eb96"; + }; + propagatedBuildInputs = [ProbePerl IPCRun3]; + }; + + TestSubCalls = buildPerlPackage rec { + name = "Test-SubCalls-1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "a334b0457da338d79be2dbb62d403701fc90f7607df840115ff45ee1e2bd6e70"; + }; + propagatedBuildInputs = [ HookLexWrap ]; + }; + TestTester = buildPerlPackage { name = "Test-Tester-0.107"; src = fetchurl { From c936e89fc1d0d24603f03917d73fd010e166317a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 30 Mar 2010 08:20:29 +0000 Subject: [PATCH 116/313] aMule 2.2.6. svn path=/nixpkgs/trunk/; revision=20866 --- pkgs/tools/networking/p2p/amule/default.nix | 14 +++++++++----- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index 886194a557f..68bf5baa333 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -1,15 +1,16 @@ { fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext -, makeWrapper }: +, pkgconfig, makeWrapper }: stdenv.mkDerivation rec { - name = "aMule-2.2.2"; + name = "aMule-2.2.6"; src = fetchurl { url = "mirror://sourceforge/amule/${name}.tar.bz2"; - sha256 = "0yrp3vk1gqfajgldfs4an5rd1l4i69icsrzcqmfxsny6qbcrv5hv"; + sha256 = "08l1931hcg1ia8yvhgx70hx64mknjnfn6l78m0ja44w13mgjpqvc"; }; - buildInputs = [ zlib wxGTK perl cryptopp libupnp gettext makeWrapper ]; + buildInputs = + [ zlib wxGTK perl cryptopp libupnp gettext pkgconfig makeWrapper ]; configureFlags = "--with-crypto-prefix=${cryptopp}"; @@ -40,6 +41,9 @@ stdenv.mkDerivation rec { applications. ''; - license = "GPLv2+"; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2230cc3024c..c459fc1bc74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -363,8 +363,8 @@ let }; amule = import ../tools/networking/p2p/amule { - inherit fetchurl stdenv zlib perl cryptopp gettext libupnp makeWrapper; - inherit wxGTK; + inherit fetchurl stdenv zlib perl cryptopp gettext libupnp makeWrapper + wxGTK pkgconfig; }; aria = builderDefsPackage (import ../tools/networking/aria) { From 88a67817c9f9b34727faa8fb437e3c936ece3343 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 31 Mar 2010 09:31:13 +0000 Subject: [PATCH 117/313] Upgraded VirtualBox to 3.1.6 svn path=/nixpkgs/trunk/; revision=20883 --- pkgs/applications/virtualization/virtualbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 942a8858912..a9f6b3250bf 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation { - name = "virtualbox-3.1.4-${kernel.version}"; + name = "virtualbox-3.1.6-${kernel.version}"; src = fetchurl { - url = http://download.virtualbox.org/virtualbox/3.1.4/VirtualBox-3.1.4-OSE.tar.bz2; - sha256 = "0w6vijjpnww33xahzfzljxfzwcz0d0flmv36dwv7g1vbx2x0m8bf"; + url = http://download.virtualbox.org/virtualbox/3.1.4/VirtualBox-3.1.6-OSE.tar.bz2; + sha256 = "05m0gsihvg0fs73a9bcivvlqkwrxvzfnyn2l59nixvy8g7w4h0c4"; }; buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl]; From e09befd92648d8299215a276acfdbfd6f97121d7 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 31 Mar 2010 09:32:52 +0000 Subject: [PATCH 118/313] Upgraded virtualbox guest additions to 3.1.6 svn path=/nixpkgs/trunk/; revision=20884 --- .../virtualization/virtualbox/guest-additions/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index a27210ebd24..0c0ccc442de 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -2,10 +2,10 @@ , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes}: stdenv.mkDerivation { - name = "VirtualBox-GuestAdditions-3.1.4"; + name = "VirtualBox-GuestAdditions-3.1.6"; src = fetchurl { - url = http://download.virtualbox.org/virtualbox/3.1.4/VBoxGuestAdditions_3.1.4.iso; - sha256 = "1x976h3vvhmhkyci9125w8v1xvlnrc7l4hgq0ghsn5bx67k5pwx6"; + url = http://download.virtualbox.org/virtualbox/3.1.6/VBoxGuestAdditions_3.1.6.iso; + sha256 = "07vylsjs960yqgz2cn57sdhrhs0i3mkb286vnl7p86i7dfl0r08s"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; buildInputs = [ patchelf cdrkit ]; From 4017164a807890a7d139351762ec3d8020da6e6d Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 31 Mar 2010 09:47:34 +0000 Subject: [PATCH 119/313] Upgraded KDE to version 4.4.2 svn path=/nixpkgs/trunk/; revision=20885 --- .../kde-4.4/accessibility/default.nix | 6 +- pkgs/desktops/kde-4.4/admin/default.nix | 6 +- pkgs/desktops/kde-4.4/artwork/default.nix | 6 +- .../desktops/kde-4.4/base-runtime/default.nix | 6 +- .../kde-4.4/base-workspace/default.nix | 6 +- pkgs/desktops/kde-4.4/base/default.nix | 6 +- pkgs/desktops/kde-4.4/bindings/default.nix | 6 +- pkgs/desktops/kde-4.4/edu/default.nix | 6 +- pkgs/desktops/kde-4.4/games/default.nix | 6 +- pkgs/desktops/kde-4.4/graphics/default.nix | 6 +- pkgs/desktops/kde-4.4/l10n/default.nix | 230 +++++++++--------- .../l10n/generate-expr-from-tarballs.pl | 4 +- pkgs/desktops/kde-4.4/libs/default.nix | 6 +- pkgs/desktops/kde-4.4/multimedia/default.nix | 6 +- pkgs/desktops/kde-4.4/network/default.nix | 6 +- .../desktops/kde-4.4/oxygen-icons/default.nix | 6 +- pkgs/desktops/kde-4.4/pim-runtime/default.nix | 6 +- pkgs/desktops/kde-4.4/pim/default.nix | 6 +- pkgs/desktops/kde-4.4/pimlibs/default.nix | 6 +- .../kde-4.4/plasma-addons/default.nix | 6 +- pkgs/desktops/kde-4.4/sdk/default.nix | 6 +- pkgs/desktops/kde-4.4/toys/default.nix | 6 +- pkgs/desktops/kde-4.4/utils/default.nix | 6 +- pkgs/desktops/kde-4.4/webdev/default.nix | 6 +- 24 files changed, 183 insertions(+), 183 deletions(-) diff --git a/pkgs/desktops/kde-4.4/accessibility/default.nix b/pkgs/desktops/kde-4.4/accessibility/default.nix index 3b0c36a4193..7929a6983b5 100644 --- a/pkgs/desktops/kde-4.4/accessibility/default.nix +++ b/pkgs/desktops/kde-4.4/accessibility/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, lib, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdeaccessibility-4.4.1"; + name = "kdeaccessibility-4.4.2"; src = fetchurl { - url = mirror://kde/stable/4.4.1/src/kdeaccessibility-4.4.1.tar.bz2; - sha256 = "09hnac6qx7svn86ch0qm8qq1cbad9fr998q0732x2x1xink387hw"; + url = mirror://kde/stable/4.4.2/src/kdeaccessibility-4.4.2.tar.bz2; + sha256 = "10n08w7x5sna0ilc965yi1041dwm13s5r4fd1valmlx8wcckrj6q"; }; # Missing: speechd, I was too lazy to implement this buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 phonon ]; diff --git a/pkgs/desktops/kde-4.4/admin/default.nix b/pkgs/desktops/kde-4.4/admin/default.nix index dca58403c7f..7bc551481d1 100644 --- a/pkgs/desktops/kde-4.4/admin/default.nix +++ b/pkgs/desktops/kde-4.4/admin/default.nix @@ -3,11 +3,11 @@ , kdelibs, kdepimlibs, kdebindings, automoc4, phonon}: stdenv.mkDerivation { - name = "kdeadmin-4.4.1"; + name = "kdeadmin-4.4.2"; src = fetchurl { - url = mirror://kde/stable/4.4.1/src/kdeadmin-4.4.1.tar.bz2; - sha256 = "0dl9ffc3c8kaw2hharli9c3b7r5s1pqzndx89p36yqciril88mh2"; + url = mirror://kde/stable/4.4.2/src/kdeadmin-4.4.2.tar.bz2; + sha256 = "0qzsfkf0gzhdzyyyfycz652ii8ivgin7zvzbkha3jz7kfbrskg9k"; }; builder = ./builder.sh; diff --git a/pkgs/desktops/kde-4.4/artwork/default.nix b/pkgs/desktops/kde-4.4/artwork/default.nix index 3b77e4261cb..16fc4be88d9 100644 --- a/pkgs/desktops/kde-4.4/artwork/default.nix +++ b/pkgs/desktops/kde-4.4/artwork/default.nix @@ -2,10 +2,10 @@ , kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}: stdenv.mkDerivation { - name = "kdeartwork-4.4.1"; + name = "kdeartwork-4.4.2"; src = fetchurl { - url = mirror://kde/stable/4.4.1/src/kdeartwork-4.4.1.tar.bz2; - sha256 = "0q99pjigjyqkjh51ni5k4yajl0arpqxpsnknahjy2bn7pi8cxsk7"; + url = mirror://kde/stable/4.4.2/src/kdeartwork-4.4.2.tar.bz2; + sha256 = "1yb9p3nsayzp4vq0sq2ax0svmf6za73g4wzj3jcbs13j0gsvpz70"; }; buildInputs = [ cmake qt4 perl xscreensaver kdelibs kdebase_workspace automoc4 phonon strigi eigen ]; diff --git a/pkgs/desktops/kde-4.4/base-runtime/default.nix b/pkgs/desktops/kde-4.4/base-runtime/default.nix index c826b3d49fc..4c7033cf462 100644 --- a/pkgs/desktops/kde-4.4/base-runtime/default.nix +++ b/pkgs/desktops/kde-4.4/base-runtime/default.nix @@ -2,10 +2,10 @@ , kdelibs, automoc4, phonon, strigi, soprano, cluceneCore, attica}: stdenv.mkDerivation { - name = "kdebase-runtime-4.4.1"; + name = "kdebase-runtime-4.4.2"; src = fetchurl { - url = mirror://kde/stable/4.4.1/src/kdebase-runtime-4.4.1.tar.bz2; - sha256 = "03yj9frnm138c6pwig9r4rw1bka05hwcrp3y90gsrrsjqakwgs4w"; + url = mirror://kde/stable/4.4.2/src/kdebase-runtime-4.4.2.tar.bz2; + sha256 = "087g05k2zrlwk4n7n14nblflxxm3g28nzyyyx18jr4r2xq9x64b5"; }; /* CLUCENE_HOME=cluceneCore;*/ # Still have to look into Soprano Virtuoso diff --git a/pkgs/desktops/kde-4.4/base-workspace/default.nix b/pkgs/desktops/kde-4.4/base-workspace/default.nix index 61c588f801d..6f682e3029d 100644 --- a/pkgs/desktops/kde-4.4/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.4/base-workspace/default.nix @@ -6,10 +6,10 @@ }: stdenv.mkDerivation { - name = "kdebase-workspace-4.4.1"; + name = "kdebase-workspace-4.4.2"; src = fetchurl { - url = mirror://kde/stable/4.4.1/src/kdebase-workspace-4.4.1.tar.bz2; - sha256 = "0smcfi2nmmsb9aw6wc3inz80apzvk9f7vkg2czhgz60pmc9hwp5j"; + url = mirror://kde/stable/4.4.2/src/kdebase-workspace-4.4.2.tar.bz2; + sha256 = "1g8rnpwpihk6sgvils9cafxz017d23ksg5i9x9275ilydslbsclc"; }; buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs kdepimlibs kdebindings libpthreadstubs boost libusb stdenv.gcc.libc libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver diff --git a/pkgs/desktops/kde-4.4/base/default.nix b/pkgs/desktops/kde-4.4/base/default.nix index ad9cc6d0ca8..a11ca3cadad 100644 --- a/pkgs/desktops/kde-4.4/base/default.nix +++ b/pkgs/desktops/kde-4.4/base/default.nix @@ -3,10 +3,10 @@ , automoc4, phonon, strigi, qimageblitz, soprano}: stdenv.mkDerivation { - name = "kdebase-4.4.1"; + name = "kdebase-4.4.2"; src = fetchurl { - url = mirror://kde/stable/4.4.1/src/kdebase-4.4.1.tar.bz2; - sha256 = "0r1939qywfnla0kzppccsc08x0lh82kqvfnmgbv9qxzqb37nqjgx"; + url = mirror://kde/stable/4.4.2/src/kdebase-4.4.2.tar.bz2; + sha256 = "1bf75y7barmymaf810n66qf47jfrn1vfqpqn5rsls8r8wjcz0j71"; }; buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394 kdebase_workspace automoc4 phonon strigi qimageblitz soprano ]; diff --git a/pkgs/desktops/kde-4.4/bindings/default.nix b/pkgs/desktops/kde-4.4/bindings/default.nix index d2f488b95fe..2a7bbee3c62 100644 --- a/pkgs/desktops/kde-4.4/bindings/default.nix +++ b/pkgs/desktops/kde-4.4/bindings/default.nix @@ -6,10 +6,10 @@ # some bindings are even broken. stdenv.mkDerivation { - name = "kdebindings-4.4.1"; + name = "kdebindings-4.4.2"; src = fetchurl { - url = mirror://kde/stable/4.4.1/src/kdebindings-4.4.1.tar.bz2; - sha256 = "1gx96nyjj050r5cr1azgshav9bmj58i4ihxlv8ma8k6vfrdrx3c1"; + url = mirror://kde/stable/4.4.2/src/kdebindings-4.4.2.tar.bz2; + sha256 = "0172xbm1mkg9zhbqjqhvc1iizaqiv7vl5d2n6rz3k9b6mpm01jyp"; }; #builder = ./builder.sh; diff --git a/pkgs/desktops/kde-4.4/edu/default.nix b/pkgs/desktops/kde-4.4/edu/default.nix index ea52926671b..451a505fd85 100644 --- a/pkgs/desktops/kde-4.4/edu/default.nix +++ b/pkgs/desktops/kde-4.4/edu/default.nix @@ -3,10 +3,10 @@ , kdelibs, automoc4, phonon, eigen, attica}: stdenv.mkDerivation { - name = "kdeedu-4.4.1"; + name = "kdeedu-4.4.2"; src = fetchurl { - url = mirror://kde/stable/4.4.1/src/kdeedu-4.4.1.tar.bz2; - sha256 = "0rivhpz3kb6gycxg6daimpbk6249qsiwg2y2k4y50ngwjv9vlxvh"; + url = mirror://kde/stable/4.4.2/src/kdeedu-4.4.2.tar.bz2; + sha256 = "0fgqsizp1vm0yp6nirbqbxj0kvbqvnb8q3wxzav4hhn85r294ps7"; }; buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml xplanet kdelibs automoc4 phonon eigen attica ]; diff --git a/pkgs/desktops/kde-4.4/games/default.nix b/pkgs/desktops/kde-4.4/games/default.nix index faac95b07d7..22e2fdf8a35 100644 --- a/pkgs/desktops/kde-4.4/games/default.nix +++ b/pkgs/desktops/kde-4.4/games/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, lib, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, phonon, qca2}: stdenv.mkDerivation { - name = "kdegames-4.4.1"; + name = "kdegames-4.4.2"; src = fetchurl { - url = mirror://kde/stable/4.4.1/src/kdegames-4.4.1.tar.bz2; - sha256 = "13xk7anmnq4lprcqahy7q6nn7b0j8mnyy070jyafzgmc5ncvylfd"; + url = mirror://kde/stable/4.4.2/src/kdegames-4.4.2.tar.bz2; + sha256 = "15qj5nj39fbv0643rk3jr1ygi46jw439qs7zvwqr0w35r3k6kp6w"; }; buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 phonon qca2 ]; meta = { diff --git a/pkgs/desktops/kde-4.4/graphics/default.nix b/pkgs/desktops/kde-4.4/graphics/default.nix index 8c435119835..fb6edd83975 100644 --- a/pkgs/desktops/kde-4.4/graphics/default.nix +++ b/pkgs/desktops/kde-4.4/graphics/default.nix @@ -3,10 +3,10 @@ , kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}: stdenv.mkDerivation { - name = "kdegraphics-4.4.1"; + name = "kdegraphics-4.4.2"; src = fetchurl { - url = mirror://kde/stable/4.4.1/src/kdegraphics-4.4.1.tar.bz2; - sha256 = "006v91f04j1z3pwdmd8d3gglfv1a5gcmrhnnd8wc3k6hr0kdncp1"; + url = mirror://kde/stable/4.4.2/src/kdegraphics-4.4.2.tar.bz2; + sha256 = "1q4yzi4y0zfjy1avbcax7sykb0g3ib01v12lg6ydxgvf3bvxibmz"; }; buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib shared_mime_info stdenv.gcc.libc libXxf86vm diff --git a/pkgs/desktops/kde-4.4/l10n/default.nix b/pkgs/desktops/kde-4.4/l10n/default.nix index 0b06cf64155..a0117997dda 100644 --- a/pkgs/desktops/kde-4.4/l10n/default.nix +++ b/pkgs/desktops/kde-4.4/l10n/default.nix @@ -4,7 +4,7 @@ let deriv = attr : stdenv.mkDerivation { - name = "kde-l10n-${attr.lang}-4.4.1"; + name = "kde-l10n-${attr.lang}-4.4.2"; src = fetchurl { url = attr.url; sha256 = attr.sha256; @@ -23,344 +23,344 @@ in ar = deriv { lang = "ar"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-ar-4.4.1.tar.bz2"; - sha256 = "09cs248qv8k6wnyd79jpikrx6w5mgl6n2q45g8ddhdjyk63x7ajf"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ar-4.4.2.tar.bz2"; + sha256 = "1vx0x08x2xqc0wcyjxnxfvb00vfgn99xzq8jx0408yj7mbm0a7h1"; }; bg = deriv { lang = "bg"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-bg-4.4.1.tar.bz2"; - sha256 = "137ilb8ij1mxrnm0snxarx0z4yw62z4c3x9ln9ic9zf5577l6m9x"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-bg-4.4.2.tar.bz2"; + sha256 = "1jfwrl68b36220bffhqqgbj21cqgn7rw777skzn6gvzd6q19848f"; }; ca = deriv { lang = "ca"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-ca-4.4.1.tar.bz2"; - sha256 = "1687krcj082yxnjmp7ifd3579x8x07gkfv2vsr5052gibmhb6x6g"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ca-4.4.2.tar.bz2"; + sha256 = "0mvls8fd9qzfj1qhv0lizm3vr22qxzpc0kkdcn77pc2ayrwx2psz"; }; cs = deriv { lang = "cs"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-cs-4.4.1.tar.bz2"; - sha256 = "0l53azcvpl29crff61x0vaar8xwlf1jx5gc8z18kgbw0gvm6m1xf"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-cs-4.4.2.tar.bz2"; + sha256 = "1x3yglhq3g159w0smrd9zg2blnk6xpc5bqdj6136rd9xh3xhg2m3"; }; csb = deriv { lang = "csb"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-csb-4.4.1.tar.bz2"; - sha256 = "0v0hbfs8ymafndwd2l8b2b18q2ar00hhyf0vh7p1kwvnvy0f6wxb"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-csb-4.4.2.tar.bz2"; + sha256 = "1jh3rqm95glz6xbl4fpydz13vhq6z3nys6hqbayvk3x4bygd2zy6"; }; da = deriv { lang = "da"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-da-4.4.1.tar.bz2"; - sha256 = "1m09bi6jr9n1aww2lfkidk661ih7gdfq7d0hpzb70m28rig9xwfz"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-da-4.4.2.tar.bz2"; + sha256 = "15y8zp15sb8yqhbck3xkpw6h1aabslsddywcwk6d9y6ipw79vnal"; }; de = deriv { lang = "de"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-de-4.4.1.tar.bz2"; - sha256 = "0mvmh75vl3x711af5x25h4jympg4ifh4ai7fy0gv5i5c9gjdvxy5"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-de-4.4.2.tar.bz2"; + sha256 = "0xnxm7xlx777y0cx681155nzda68xbnmnf62gjvd6pxpcd40s3hk"; }; el = deriv { lang = "el"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-el-4.4.1.tar.bz2"; - sha256 = "1mgh42phv34ryf24nqrbhbpmn6gnw2pq7dwiz7vybf44ai6x5ycw"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-el-4.4.2.tar.bz2"; + sha256 = "0jn3fwyy22s4nabzpl3pslp5z63yb50l29ca8rg4j7mz46xbsb3w"; }; en_GB = deriv { lang = "en_GB"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-en_GB-4.4.1.tar.bz2"; - sha256 = "0m6a867gwbl08xrpdv8gxq91n3czav6mp868gxvdgib75nfqk0rh"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-en_GB-4.4.2.tar.bz2"; + sha256 = "1vzlbax5m68xvgwp8ls4i8bj1lvh8bj88jh65wqqpf5w2rj3ndbk"; }; eo = deriv { lang = "eo"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-eo-4.4.1.tar.bz2"; - sha256 = "1brhq8hb65v34p3mzgryrp41qr2bahfrlf0hsjbz84cx8arm86v3"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-eo-4.4.2.tar.bz2"; + sha256 = "0z3320czlwvsjij5rfv1drv6x4d61aqvxsq1yj876av4w7pys7r9"; }; es = deriv { lang = "es"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-es-4.4.1.tar.bz2"; - sha256 = "0ssawrjwbg3fyhgp1d1fafb2yvhhn9zwfwc5lz2fnl9a048y1hlp"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-es-4.4.2.tar.bz2"; + sha256 = "0fsqcj809vf2zahkiqlmdxzpxzgwj437267lgfdjp65amsfw2cmd"; }; et = deriv { lang = "et"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-et-4.4.1.tar.bz2"; - sha256 = "0v12cqs67xkbcxf00nyailpn5yzhkslpdicyhgdch984zra3qss8"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-et-4.4.2.tar.bz2"; + sha256 = "189y04kgbjx3pbbp46g1v9i5h9bz02zfgvy4l6nw1v97bnkrkjrr"; }; eu = deriv { lang = "eu"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-eu-4.4.1.tar.bz2"; - sha256 = "10adk7qz0jrmv420y4r2xwj9qydfhnciaprpg34afbc2vm4c0gwh"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-eu-4.4.2.tar.bz2"; + sha256 = "0v41s33lvmyrlsn6cvqj42b8r0d36lci8lins3212g0sw5fkc83p"; }; fi = deriv { lang = "fi"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-fi-4.4.1.tar.bz2"; - sha256 = "142irya0v3dm16iw5r6sh0aw8z80dyiybc9cizbnii4xdmwsx62k"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-fi-4.4.2.tar.bz2"; + sha256 = "0j90qd3ll1ycj8d5ms4rmbkbw280cvgx47z5q6byfv4qaq2sq2bv"; }; fr = deriv { lang = "fr"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-fr-4.4.1.tar.bz2"; - sha256 = "0vsia4qf4x7l770ah5g9m5wcgjrhhqm5viy003qvnbn0a70420il"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-fr-4.4.2.tar.bz2"; + sha256 = "0sf0fdvmqrv6qxy6bmvb03fq9vdv1y4y28475s6vn6alz94q9ga1"; }; fy = deriv { lang = "fy"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-fy-4.4.1.tar.bz2"; - sha256 = "1d4gwppxsdmvb6hax04nns14jhhkjcylm8cw3km4hmhw2058xzwk"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-fy-4.4.2.tar.bz2"; + sha256 = "1jb1mmw08bf9rmm8qipfwc86w9klcs1zynsyjfabc4p38jp4pirn"; }; ga = deriv { lang = "ga"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-ga-4.4.1.tar.bz2"; - sha256 = "1i0xmbsqf72zig64kis1bnw2qlz70006l9989bcifis9y99b6xi7"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ga-4.4.2.tar.bz2"; + sha256 = "0pijkmbj0bspwcrncn890ycgf2hxh2yxsayry0fkl9rcxz556bwy"; }; gl = deriv { lang = "gl"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-gl-4.4.1.tar.bz2"; - sha256 = "181yxv7nc1h3yz9kqfqdz2ykgjblp88ipgcwxvwb2486zmy5z11f"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-gl-4.4.2.tar.bz2"; + sha256 = "02ccvdabnwp112483k2yb1w3b390cg61a7wl3pw02kkmxx5lcc7n"; }; gu = deriv { lang = "gu"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-gu-4.4.1.tar.bz2"; - sha256 = "16ba0bn3yzp0v8nlyxhk6sg9v8khlwnf8b2griz9ffn18ayjfxdz"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-gu-4.4.2.tar.bz2"; + sha256 = "1dzpmwf7n29w3hfzhbyvj06jbs1mxxn46g9w98mclbis9ign10p1"; }; he = deriv { lang = "he"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-he-4.4.1.tar.bz2"; - sha256 = "1sdgw9bgxgkh05yxqvpplanzwmavjnyskzi6i6fw5yj9kfpbj5i4"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-he-4.4.2.tar.bz2"; + sha256 = "0my1l4nsjpyjgx118jdw5px0pmb621pyns5c4708y9if8pwdv7hv"; }; hi = deriv { lang = "hi"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-hi-4.4.1.tar.bz2"; - sha256 = "1a909kgv343v6467p4jzqh4xi584zsn4b2v88ygw5nv2gb6kg37m"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-hi-4.4.2.tar.bz2"; + sha256 = "0rj4bny1kv7rwnj01vcjxxa620vsdx5v03va4szhgdv4bm04j011"; }; hr = deriv { lang = "hr"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-hr-4.4.1.tar.bz2"; - sha256 = "0ap1c2rx88i8dxz6109lb4lb3168hahg70n3rnjd8vwp1k337n12"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-hr-4.4.2.tar.bz2"; + sha256 = "1l7vnjsklqk0dcb4zccifl77gaa9k72j70d0fa3vmw1bf0y7yld7"; }; hu = deriv { lang = "hu"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-hu-4.4.1.tar.bz2"; - sha256 = "1qa4mdfqya8fw9c2v9xcpbb7f6sjq0h9wrbpcl5rnks86d8ii2xg"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-hu-4.4.2.tar.bz2"; + sha256 = "1zwxg38lspan3z3y3an4ypm7wwf1qgv1kz9k7p9jqj661j58g0j8"; }; id = deriv { lang = "id"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-id-4.4.1.tar.bz2"; - sha256 = "19j42p9vw6fgim4d4f3xvvmkrmybvz7a1bggqx6n2wi9ap8ibjwx"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-id-4.4.2.tar.bz2"; + sha256 = "0h59z03q9rv07g8hyzh2km0l0znddvflxz9jb047rgyll1ah96js"; }; is = deriv { lang = "is"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-is-4.4.1.tar.bz2"; - sha256 = "1c8872gzri298qsr3grxgirijm6fskkxkc98a8wh5zcl7lplm5li"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-is-4.4.2.tar.bz2"; + sha256 = "15dz28jrzb38mn19l3wgprh9p2q1xsd08c25m911849fn4kvcs59"; }; it = deriv { lang = "it"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-it-4.4.1.tar.bz2"; - sha256 = "1jsblj27lhrfiy9fgsnx8af0p7ginwhr7apmdkxlrcv6py0xn683"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-it-4.4.2.tar.bz2"; + sha256 = "1hqw8k6gns66clfaxyqdvbxmac1p2j2nl5vzabb9dxqxm6i4a6dm"; }; ja = deriv { lang = "ja"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-ja-4.4.1.tar.bz2"; - sha256 = "0ifqvchb9k36m15z583vqlw61fa2rbw9ryqasjpqnqq1vs6dnir8"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ja-4.4.2.tar.bz2"; + sha256 = "0awyr5iad03gjb2agcvyzpiq3hh3jdgar970n9g8d6in5p33jnba"; }; kk = deriv { lang = "kk"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-kk-4.4.1.tar.bz2"; - sha256 = "1zw3xwc37ibis9w4abxc9q4dqy1k5c3i4281v9653zkq9pgm66ym"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-kk-4.4.2.tar.bz2"; + sha256 = "173i7f236c55nsfn9m24s3pn63fkp51wylgj2whqi6pl3s2f2iz1"; }; km = deriv { lang = "km"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-km-4.4.1.tar.bz2"; - sha256 = "0nbn60pm2cvkbjqibdilzzfasc3i3bl8m77x1l6wqp7s0g70sq1l"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-km-4.4.2.tar.bz2"; + sha256 = "0d9y8hvb2r55gj41g7gpr5iiz1dmayg05ry1yy1w1f800iv5756x"; }; kn = deriv { lang = "kn"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-kn-4.4.1.tar.bz2"; - sha256 = "03lg31qqfax0z2akm4hw8whlabbx0br8gyw8zpmk345nvk261rmc"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-kn-4.4.2.tar.bz2"; + sha256 = "1s1ig0pa804mx59b7sxci3i5pa1gqb4naw123vay8g0mkq3jjnqn"; }; ko = deriv { lang = "ko"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-ko-4.4.1.tar.bz2"; - sha256 = "19mqlc1sgphar8pslkxzcrsz3h8z4dbyvl514bfwmpfn6q0m839k"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ko-4.4.2.tar.bz2"; + sha256 = "0x0gbpa0f21rm2ls2kjyjbz9wl1yj8bsc0qc3bl5g6xk4kr6j634"; }; lt = deriv { lang = "lt"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-lt-4.4.1.tar.bz2"; - sha256 = "112rhksnlr182vahrvcj64wzjzf7dmrywavr8agd0db2lalyrwpx"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-lt-4.4.2.tar.bz2"; + sha256 = "0jxdwqi7lz9brxw80kfix5wxx1x421n628zf4dkyd7szdl3svxc8"; }; lv = deriv { lang = "lv"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-lv-4.4.1.tar.bz2"; - sha256 = "1q8jhmmycpk4lvk6n5q71v97adi2liaa97hy632ykrp6h1la7akm"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-lv-4.4.2.tar.bz2"; + sha256 = "03yi2gj8ckdmz8wyq8dj1kwzl7g8xz5g3ppmw2h4w6xmh0kdbkdy"; }; mai = deriv { lang = "mai"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-mai-4.4.1.tar.bz2"; - sha256 = "1jczhqj5klw9lhf0ag9gpqzdj85zn9f180rypgs5nzphvvghisqc"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-mai-4.4.2.tar.bz2"; + sha256 = "069mx66ib9bwjh0c0ndnsdrj2xlzdbbihz9yc4br1vd3disj1jd2"; }; mk = deriv { lang = "mk"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-mk-4.4.1.tar.bz2"; - sha256 = "1icdbgmcg1xakq9lxq1k8xr3i3dhirmk5428gzrxz7fgc63d5zsh"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-mk-4.4.2.tar.bz2"; + sha256 = "01k1bzmmq8g59xvyn4pxxapbd8x1a85ps2z241zlhlrpmi6faja8"; }; ml = deriv { lang = "ml"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-ml-4.4.1.tar.bz2"; - sha256 = "074nqzaysmq0h65airwhcnk7n0dbm2fhssg72yc6bdi60yklhyy8"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ml-4.4.2.tar.bz2"; + sha256 = "0vpj5i30p6hbabvqyfkzyjcwqblh2qz167bja3589halhdiadhf4"; }; nb = deriv { lang = "nb"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-nb-4.4.1.tar.bz2"; - sha256 = "0r1hgm28dmllyk86x73srnq1sr4xa6f0wnmw9v8pgd5r1656pzzb"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-nb-4.4.2.tar.bz2"; + sha256 = "1kh0cwfds7gh5rda4vhccwrjlgmbvcgkwr9gyiy8ssx02absqcz0"; }; nds = deriv { lang = "nds"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-nds-4.4.1.tar.bz2"; - sha256 = "1bi41a28dqff9k2jf17v9djg8iq570j3ahxddv02fgp8lwsy8prg"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-nds-4.4.2.tar.bz2"; + sha256 = "18h7j89dmc95b24fgziixmfz1x8jhxnpwanhq3yb3f243j7rkvmn"; }; nl = deriv { lang = "nl"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-nl-4.4.1.tar.bz2"; - sha256 = "11avyryx8xa0l2f5zn3jj0rk6n8kw5j1cjkhrq70kxylzpzaic1g"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-nl-4.4.2.tar.bz2"; + sha256 = "0s2941ywppgpnvafqqbfciliv6qllsjm5migzbqd5pwhpjifjjsl"; }; nn = deriv { lang = "nn"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-nn-4.4.1.tar.bz2"; - sha256 = "1jyz3cj1fxk0jbrakm97h1sd7qwmll4vab754vj3k8m8s2zlsdw6"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-nn-4.4.2.tar.bz2"; + sha256 = "1phl56asdsn30wk2k9q6dhy99jvy2n11w2ny680jzdpc7gqp7j1n"; }; pa = deriv { lang = "pa"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-pa-4.4.1.tar.bz2"; - sha256 = "0l8lk34xg6a686hrs4z8xrzhcgc1kr2x66vsr3lhwjid5krgc1g4"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-pa-4.4.2.tar.bz2"; + sha256 = "0d5nksy2wr0glq5n82knfl4hhc6na55y5dp20q678agvxyz7nq94"; }; pl = deriv { lang = "pl"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-pl-4.4.1.tar.bz2"; - sha256 = "1yrb0cqw7bkw1axc0lx75lhxmx7mngg0nc07r3qx3sdg99jvihk1"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-pl-4.4.2.tar.bz2"; + sha256 = "1jbxbrqcp2cn6wijsm8jpqj925b5dc3s7120jqp4w25lr92gnip1"; }; pt = deriv { lang = "pt"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-pt-4.4.1.tar.bz2"; - sha256 = "18m3d6m8ikzifigqhrgczfv716dd3sshnf3m7gryl404xnm2qrrx"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-pt-4.4.2.tar.bz2"; + sha256 = "1c17axsrjxjq101wd0yihf098q3lhwxqii2i4wcjpvi3iarrc5ri"; }; pt_BR = deriv { lang = "pt_BR"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-pt_BR-4.4.1.tar.bz2"; - sha256 = "0yvvzch1wgfnshk1b1pvak0jsssfbydqbdpdlb103l6jxkp3i7ah"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-pt_BR-4.4.2.tar.bz2"; + sha256 = "0hkrj5kps37xifzsj89d9ky0hq7ddk9jblaccg22bwc4vh3d5vh1"; }; ro = deriv { lang = "ro"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-ro-4.4.1.tar.bz2"; - sha256 = "1j8x55bmp5rpssv3sqlj9i99zznpns3x712n34hhv8ykd7bwlqbs"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ro-4.4.2.tar.bz2"; + sha256 = "04qpzdic051xib0xnlg0jw9lnp45wgqc85l91a4pl50w3afcjcx2"; }; ru = deriv { lang = "ru"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-ru-4.4.1.tar.bz2"; - sha256 = "0yfyavrljj9mxjpyyiqcmjbkyaqm2dv675b998m728bhsmy5i4kp"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ru-4.4.2.tar.bz2"; + sha256 = "0pbmr5pddys3rmsfy4zmynhzb3lc9381k2kw4nw3sqgv888p3xwv"; }; si = deriv { lang = "si"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-si-4.4.1.tar.bz2"; - sha256 = "0gm2p9fp0v6a5q4sj1ygww68pxqs3dmzdgc7r19ig9d0y1fh62xw"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-si-4.4.2.tar.bz2"; + sha256 = "1kw60d4v71vrfpb9fcsvjk0inaws1p2wsd3cw3sr2xnqk9yiwx1l"; }; sk = deriv { lang = "sk"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-sk-4.4.1.tar.bz2"; - sha256 = "0cwygbnfmvcjcxr3hna4ymqb62disnkamqqf81xa04nizb640rnp"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-sk-4.4.2.tar.bz2"; + sha256 = "1h3nkgvzifkk456kdnj0fmi4aazn08lz1s4km8699gl15zv6i5zx"; }; sl = deriv { lang = "sl"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-sl-4.4.1.tar.bz2"; - sha256 = "16zraz3143qfp6rdy2dh1iwkm2qaki0mgdhx11hh399rqrijpxba"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-sl-4.4.2.tar.bz2"; + sha256 = "0671a6crik2wn40kbvfa7dvwxdyznmac3frpvr2g20430g6d58n3"; }; sr = deriv { lang = "sr"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-sr-4.4.1.tar.bz2"; - sha256 = "02ywl78spi3lys7lndlxh3dma972lphvx4373qsbl9hjsggfv9i2"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-sr-4.4.2.tar.bz2"; + sha256 = "12pbjyij5dp9y6kxw995zw07fa174yaidc9mxsx0kv34sylnz9yn"; }; sv = deriv { lang = "sv"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-sv-4.4.1.tar.bz2"; - sha256 = "1ynn6h2nssg9iwkamkfgykv5520aj68vy3rlfrhgzbssh1760zzz"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-sv-4.4.2.tar.bz2"; + sha256 = "1hs8szh09av5900s3cfjrmx8ynyz3ggv7l6gaaxsy4vfvslvd8vc"; }; tg = deriv { lang = "tg"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-tg-4.4.1.tar.bz2"; - sha256 = "1g1rxk1h8aq4yn0v5g1vlljq9cwxyg5p0dr5432jlsglp4syyyx0"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-tg-4.4.2.tar.bz2"; + sha256 = "0mjlq6sbknd8lan9vaj8479a0hd6gk272d5an5n6d3m4q68smsx5"; }; tr = deriv { lang = "tr"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-tr-4.4.1.tar.bz2"; - sha256 = "13l5qd83r4nqqib791y9p5k807kwrz709rbvnimlpikzibg9n743"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-tr-4.4.2.tar.bz2"; + sha256 = "1g7lr6by3i32x0la20r1dsjbf6z376bd065rnfwdhnibaaidqm2p"; }; uk = deriv { lang = "uk"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-uk-4.4.1.tar.bz2"; - sha256 = "1ipz2y6488gs2i0xkq0688ac0jnw17dxwj4rw81bas0khsslwq0m"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-uk-4.4.2.tar.bz2"; + sha256 = "13px5in34hkzwx25525cjbqlnxghqws1rnipm0mhb9q4yww98ccx"; }; wa = deriv { lang = "wa"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-wa-4.4.1.tar.bz2"; - sha256 = "17l4vda9ikxb3fx8f8ask6g9m0bqihq7q8h7c3fix5f3fjs94l6r"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-wa-4.4.2.tar.bz2"; + sha256 = "0g3jy5d5zxp8996i3n3g6fzlnsgkjf828x2xjz9494nx176xqdkk"; }; zh_CN = deriv { lang = "zh_CN"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-zh_CN-4.4.1.tar.bz2"; - sha256 = "103519yi7hi37rfghlbnxqz9fxh3jnrw4iq882w65zganq9gqck9"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-zh_CN-4.4.2.tar.bz2"; + sha256 = "1yg2wg7pyknrc12fv9h78xh4imcqlzy5xxg266npv4c3n6b90xdh"; }; zh_TW = deriv { lang = "zh_TW"; - url = "mirror://kde/stable/4.4.1/src/kde-l10n/kde-l10n-zh_TW-4.4.1.tar.bz2"; - sha256 = "02b25lxmjh35ymc11gcci1inhjllfz05yfbbaw1my18vfy6k1jdb"; + url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-zh_TW-4.4.2.tar.bz2"; + sha256 = "17q3ymwvrpp81rjw7vz60l3z6yg9mja0h5v37chzlbfnfdhngq39"; }; } diff --git a/pkgs/desktops/kde-4.4/l10n/generate-expr-from-tarballs.pl b/pkgs/desktops/kde-4.4/l10n/generate-expr-from-tarballs.pl index 15b00a5a042..32dbfa1488d 100755 --- a/pkgs/desktops/kde-4.4/l10n/generate-expr-from-tarballs.pl +++ b/pkgs/desktops/kde-4.4/l10n/generate-expr-from-tarballs.pl @@ -2,7 +2,7 @@ # Typical command to generate the list of tarballs: -# export i="mirror://kde/stable/4.4.1/src/kde-l10n/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs.list +# export i="mirror://kde/stable/4.4.2/src/kde-l10n/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs.list # manually update extra.list # then run: cat tarballs-7.4.list extra.list old.list | perl ./generate-expr-from-tarballs.pl @@ -63,7 +63,7 @@ print OUT < Date: Wed, 31 Mar 2010 09:49:58 +0000 Subject: [PATCH 120/313] Fixed the download URL of virtualbox svn path=/nixpkgs/trunk/; revision=20886 --- pkgs/applications/virtualization/virtualbox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index a9f6b3250bf..39ed68ce9f7 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "virtualbox-3.1.6-${kernel.version}"; src = fetchurl { - url = http://download.virtualbox.org/virtualbox/3.1.4/VirtualBox-3.1.6-OSE.tar.bz2; + url = http://download.virtualbox.org/virtualbox/3.1.6/VirtualBox-3.1.6-OSE.tar.bz2; sha256 = "05m0gsihvg0fs73a9bcivvlqkwrxvzfnyn2l59nixvy8g7w4h0c4"; }; From cc7a6e0b1d4a5e67714867f789594572e88ee9f9 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 31 Mar 2010 11:45:33 +0000 Subject: [PATCH 121/313] Upgraded PyQt to version 4.7.2 svn path=/nixpkgs/trunk/; revision=20889 --- pkgs/development/python-modules/pyqt/4.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/4.7.nix b/pkgs/development/python-modules/pyqt/4.7.nix index 2390ac771d4..eb09a32d00c 100644 --- a/pkgs/development/python-modules/pyqt/4.7.nix +++ b/pkgs/development/python-modules/pyqt/4.7.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "pyqt-x11-gpl-4.7.2"; src = fetchurl { - url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.tar.gz; - sha256 = "0hwp84igw639mgw344q2jmnjarhq5wk60ncn8h2jjg7k4vchbvkz"; + url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.2.tar.gz; + sha256 = "097gxdr7jqv5a58z89djylm2b21x83crqn2fjsr5zmwhc0zwj5yv"; }; configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins"; From 855bcdf62694f011364e1cb2c683ba1c8910c38c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 1 Apr 2010 08:57:26 +0000 Subject: [PATCH 122/313] Fixing the wdfs url. I noticed wdfs works. And the older fusedav does not at all. I may remove fusedav. svn path=/nixpkgs/trunk/; revision=20899 --- pkgs/tools/filesystems/wdfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index 8bd7101d8f2..68d978a2a55 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "wdfs-fuse-1.4.2"; src = fetchurl { - url = "http://noedler.de/projekte/wdfs/${name}.tar.gz"; + url = "http://noedler.de/projekte/wdfs/wdfs-1.4.2.tar.gz"; sha256 = "fcf2e1584568b07c7f3683a983a9be26fae6534b8109e09167e5dff9114ba2e5"; }; buildInputs = [fuse glib neon pkgconfig]; From 5e1ea06c0f476261b673a5e037d5b0216dc08ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Apr 2010 09:26:29 +0000 Subject: [PATCH 123/313] boehm-gc: Fix x86_64-darwin builds. svn path=/nixpkgs/trunk/; revision=20900 --- pkgs/development/libraries/boehm-gc/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 0983edbcdd2..025ad6c1dc8 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -44,3 +44,10 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.all; }; } + +// + +(if stdenv.system == "x86_64-darwin" + # Fix "#error ucontext routines are deprecated, and require _XOPEN_SOURCE to be defined". + then { configureFlags = "CPPFLAGS=-D_XOPEN_SOURCE"; } + else {}) From 50b5ca25d3e611b7259654cf25c09bcbc5a281e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Apr 2010 10:05:58 +0000 Subject: [PATCH 124/313] boehm-gc: Add missing brackets. svn path=/nixpkgs/trunk/; revision=20902 --- pkgs/development/libraries/boehm-gc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 025ad6c1dc8..8e6f6749533 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: let version = "7.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "boehm-gc-${version}"; src = fetchurl { @@ -50,4 +50,4 @@ stdenv.mkDerivation { (if stdenv.system == "x86_64-darwin" # Fix "#error ucontext routines are deprecated, and require _XOPEN_SOURCE to be defined". then { configureFlags = "CPPFLAGS=-D_XOPEN_SOURCE"; } - else {}) + else {})) From 93702256634630207cf3e0f92178412017002d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 1 Apr 2010 10:56:48 +0000 Subject: [PATCH 125/313] Haskell Platform 2010.1.0.0 svn path=/nixpkgs/trunk/; revision=20904 --- .../libraries/haskell/GLUT/2.1.2.1.nix | 12 ++ .../libraries/haskell/HTTP/4000.0.9.nix | 12 ++ .../libraries/haskell/HUnit/1.2.2.1.nix | 11 ++ .../libraries/haskell/OpenGL/2.2.3.0.nix | 12 ++ .../haskell/QuickCheck/QuickCheck-2.nix | 4 +- .../libraries/haskell/cgi/3001.1.7.2.nix | 12 ++ .../libraries/haskell/deepseq/default.nix | 11 ++ .../libraries/haskell/fgl/default.nix | 2 +- .../libraries/haskell/ghc-paths/0.1.0.6.nix | 11 ++ .../haskell/haskell-platform/2010.1.0.0.nix | 21 ++++ .../libraries/haskell/mtl/default.nix | 2 +- .../libraries/haskell/network/2.2.1.7.nix | 12 ++ .../libraries/haskell/parallel/2.2.0.1.nix | 12 ++ .../libraries/haskell/parsec/default.nix | 2 +- .../libraries/haskell/regex-base/0.93.1.nix | 12 ++ .../libraries/haskell/regex-compat/0.92.nix | 12 ++ .../libraries/haskell/regex-posix/0.94.1.nix | 12 ++ .../libraries/haskell/stm/default.nix | 2 +- .../libraries/haskell/xhtml/default.nix | 2 +- .../libraries/haskell/zlib/0.5.2.0.nix | 13 +++ .../documentation/haddock/haddock-2.7.2.nix | 13 +++ pkgs/development/tools/parsing/alex/2.3.2.nix | 12 ++ .../cabal-install/0.8.0.nix | 13 +++ pkgs/top-level/haskell-packages.nix | 107 +++++++++++++++++- 24 files changed, 325 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix create mode 100644 pkgs/development/libraries/haskell/HTTP/4000.0.9.nix create mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix create mode 100644 pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix create mode 100644 pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix create mode 100644 pkgs/development/libraries/haskell/deepseq/default.nix create mode 100644 pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix create mode 100644 pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix create mode 100644 pkgs/development/libraries/haskell/network/2.2.1.7.nix create mode 100644 pkgs/development/libraries/haskell/parallel/2.2.0.1.nix create mode 100644 pkgs/development/libraries/haskell/regex-base/0.93.1.nix create mode 100644 pkgs/development/libraries/haskell/regex-compat/0.92.nix create mode 100644 pkgs/development/libraries/haskell/regex-posix/0.94.1.nix create mode 100644 pkgs/development/libraries/haskell/zlib/0.5.2.0.nix create mode 100644 pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix create mode 100644 pkgs/development/tools/parsing/alex/2.3.2.nix create mode 100644 pkgs/tools/package-management/cabal-install/0.8.0.nix diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix new file mode 100644 index 00000000000..9fa0690ad6b --- /dev/null +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix @@ -0,0 +1,12 @@ +{cabal, OpenGL, glut, libSM, libICE, libXmu, libXi, mesa}: + +cabal.mkDerivation (self : { + pname = "GLUT"; + version = "2.1.2.1"; # Haskell Platform 2010.1.0.0 + sha256 = "0230bfacbfb85c126f1fba45fcd8d02f20da9ee19180b5ada698224362d17264"; + propagatedBuildInputs = [OpenGL glut libSM libICE libXmu libXi mesa]; + meta = { + description = "A binding for the OpenGL Utility Toolkit"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix new file mode 100644 index 00000000000..0600a957883 --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix @@ -0,0 +1,12 @@ +{cabal, mtl, network, parsec}: + +cabal.mkDerivation (self : { + pname = "HTTP"; + version = "4000.0.9"; # Haskell Platform 2010.1.0.0 + sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba"; + propagatedBuildInputs = [mtl network parsec]; + meta = { + description = "a Haskell library for client-side HTTP"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix new file mode 100644 index 00000000000..9f52ed4048f --- /dev/null +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "HUnit"; + version = "1.2.2.1"; # Haskell Platform 2010.1.0.0 + sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853"; + meta = { + description = "A unit testing framework for Haskell"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix new file mode 100644 index 00000000000..e3cb4bdf4e6 --- /dev/null +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix @@ -0,0 +1,12 @@ +{cabal, mesa, libX11}: + +cabal.mkDerivation (self : { + pname = "OpenGL"; + version = "2.2.3.0"; # Haskell Platform 2010.1.0.0 + sha256 = "a75c3277bb20fda9a4ac1eb0e838fe4b5baf92f5539466b92bd255626afb0502"; + propagatedBuildInputs = [mesa libX11]; + meta = { + description = "A binding for the OpenGL graphics system"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix b/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix index 4e9bdefc537..6ad15d15380 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "QuickCheck"; - version = "2.1.0.2"; - sha256 = "1adeea5aa52cba7b8bcd27f9cdd9fe944e9a4a22d22fdf0570b526f580981e58"; + version = "2.1.0.3"; # Haskell Platform 2010.1.0.0 + sha256 = "91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1"; propagatedBuildInputs = [mtl]; meta = { description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix new file mode 100644 index 00000000000..89e6df5004c --- /dev/null +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix @@ -0,0 +1,12 @@ +{cabal, mtl, network, parsec, xhtml}: + +cabal.mkDerivation (self : { + pname = "cgi"; + version = "3001.1.7.2"; # Haskell Platform 2010.1.0.0 + sha256 = "ad35971388fa1809a5cd71bb2f051d69d753e4153b43d843b431674cf79a1c39"; + propagatedBuildInputs = [mtl network parsec xhtml]; + meta = { + description = "A library for writing CGI programs"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/deepseq/default.nix b/pkgs/development/libraries/haskell/deepseq/default.nix new file mode 100644 index 00000000000..6658f86de75 --- /dev/null +++ b/pkgs/development/libraries/haskell/deepseq/default.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "deepseq"; + version = "1.1.0.0"; # Haskell Platform 2010.1.0.0 + sha256 = "947c45e7ee862159f190fb8e905c1328f7672cb9e6bf3abd1d207bbcf1eee50a"; + meta = { + description = "Provides a deep version of seq, for fully evaluating data structures"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/fgl/default.nix b/pkgs/development/libraries/haskell/fgl/default.nix index 062e0a5ac59..f14031aec5f 100644 --- a/pkgs/development/libraries/haskell/fgl/default.nix +++ b/pkgs/development/libraries/haskell/fgl/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "fgl"; - version = "5.4.2.2"; + version = "5.4.2.2"; # Haskell Platform 2010.1.0.0 sha256 = "8232c337f0792854bf2a12a5fd1bc46726fff05d2f599053286ff873364cd7d2"; propagatedBuildInputs = [mtl]; meta = { diff --git a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix b/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix new file mode 100644 index 00000000000..f8c4a29e5e1 --- /dev/null +++ b/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix @@ -0,0 +1,11 @@ +{ cabal } : + +cabal.mkDerivation (self : { + pname = "ghc-paths"; + version = "0.1.0.6"; + sha256 = "95d8c0e6ce2f182d792e910149b3c81c381b7d2c2052ffc6d96128b071c55243"; + meta = { + description = "Knowledge of GHC's installations directories"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix new file mode 100644 index 00000000000..8d34277d846 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix @@ -0,0 +1,21 @@ +{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, + haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix, + stm, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}: + +cabal.mkDerivation (self : { + pname = "haskell-platform"; + version = "2010.1.0.0"; + src = fetchurl { + url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; + sha256 = "64c9fec5cdc4b6f515b7f296d59984d2dee05927b7e24ea67324ad5f4ac3e994"; + }; + propagatedBuildInputs = [ + GLUT HTTP HUnit OpenGL QuickCheck cgi fgl + haskellSrc html network parallel regexBase regexCompat regexPosix + stm xhtml zlib cabalInstall alex happy ghc haddock + ]; + meta = { + description = "Haskell Platform meta package"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/mtl/default.nix b/pkgs/development/libraries/haskell/mtl/default.nix index 5881a2cd3df..6c8b1cf960d 100644 --- a/pkgs/development/libraries/haskell/mtl/default.nix +++ b/pkgs/development/libraries/haskell/mtl/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "mtl"; - version = "1.1.0.2"; # Haskell Platform 2009.0.0 + version = "1.1.0.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0 sha256 = "a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36"; meta = { description = "Monad transformer library"; diff --git a/pkgs/development/libraries/haskell/network/2.2.1.7.nix b/pkgs/development/libraries/haskell/network/2.2.1.7.nix new file mode 100644 index 00000000000..e04af7a932b --- /dev/null +++ b/pkgs/development/libraries/haskell/network/2.2.1.7.nix @@ -0,0 +1,12 @@ +{cabal, parsec}: + +cabal.mkDerivation (self : { + pname = "network"; + version = "2.2.1.7"; # Haskell Platform 2010.1.0.0 + sha256 = "0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58"; + propagatedBuildInputs = [parsec]; + meta = { + description = "Networking-related facilities"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix new file mode 100644 index 00000000000..38ec8247076 --- /dev/null +++ b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix @@ -0,0 +1,12 @@ +{cabal, deepseq}: + +cabal.mkDerivation (self : { + pname = "parallel"; + version = "2.2.0.1"; # Haskell Platform 2010.1.0.0 + sha256 = "255310023138ecf618c8b450203fa2fc65feb68cd08ee4d369ceae72054168fd"; + propagatedBuildInputs = [deepseq]; + meta = { + description = "parallel programming library"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/parsec/default.nix b/pkgs/development/libraries/haskell/parsec/default.nix index e0564d5720d..b0dcf5ef0e4 100644 --- a/pkgs/development/libraries/haskell/parsec/default.nix +++ b/pkgs/development/libraries/haskell/parsec/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "parsec"; - version = "2.1.0.1"; # Haskell Platform 2009.0.0 + version = "2.1.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0 sha256 = "2d85e5b5c8b2b1f341037ce67e1db7fa47b31c083136796cfef9e5b945c656df"; meta = { description = "Monadic parser combinators"; diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix new file mode 100644 index 00000000000..73d5afeedb2 --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix @@ -0,0 +1,12 @@ +{cabal, mtl}: + +cabal.mkDerivation (self : { + pname = "regex-base"; + version = "0.93.1"; # Haskell Platform 2010.1.0.0 + sha256 = "24a0e76ab308517a53d2525e18744d9058835626ed4005599ecd8dd4e07f3bef"; + propagatedBuildInputs = [mtl]; + meta = { + description = "Replaces/Ehances Text.Regex"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix new file mode 100644 index 00000000000..68e9d2321d0 --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-compat/0.92.nix @@ -0,0 +1,12 @@ +{cabal, regexBase, regexPosix}: + +cabal.mkDerivation (self : { + pname = "regex-compat"; + version = "0.92"; # Haskell Platform 2010.1.0.0 + sha256 = "430d251bd704071fca1e38c9b250543f00d4e370382ed552ac3d7407d4f27936"; + propagatedBuildInputs = [regexBase regexPosix]; + meta = { + description = "Replaces/Enhances Text.Regex"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix new file mode 100644 index 00000000000..1e7db2ab0b1 --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix @@ -0,0 +1,12 @@ +{cabal, regexBase}: + +cabal.mkDerivation (self : { + pname = "regex-posix"; + version = "0.94.1"; # Haskell Platform 2010.1.0.0 + sha256 = "63e76de0610d35f1b576ae65a25a38e04e758ed64b9b3512de95bdffd649485c"; + propagatedBuildInputs = [regexBase]; + meta = { + description = "Replaces/Enhances Text.Regex"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/stm/default.nix b/pkgs/development/libraries/haskell/stm/default.nix index 707fd980cbf..de3f7e3bc03 100644 --- a/pkgs/development/libraries/haskell/stm/default.nix +++ b/pkgs/development/libraries/haskell/stm/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "stm"; - version = "2.1.1.2"; # Haskell Platform 2009.0.0 + version = "2.1.1.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0 sha256 = "68d550067ae180373142c51f3fa14bdf0a1516310aee9a37e28f9ac7cf3b8c6d"; meta = { description = "Software Transactional Memory"; diff --git a/pkgs/development/libraries/haskell/xhtml/default.nix b/pkgs/development/libraries/haskell/xhtml/default.nix index 916b57e3263..c09ed444d3e 100644 --- a/pkgs/development/libraries/haskell/xhtml/default.nix +++ b/pkgs/development/libraries/haskell/xhtml/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "xhtml"; - version = "3000.2.0.1"; # Haskell Platform 2009.0.0 + version = "3000.2.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0 sha256 = "60d7a44ae6d607475e2d60c5bf9909b8a3bd88850d52b08ff1532aa6d58bec96"; meta = { description = "An XHTML combinator library"; diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix new file mode 100644 index 00000000000..d97e18ccf23 --- /dev/null +++ b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix @@ -0,0 +1,13 @@ +{cabal, zlib}: + +cabal.mkDerivation (self : { + pname = "zlib"; + version = "0.5.2.0"; # Haskell Platform 2010.1.0.0 + sha256 = "4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f"; + # TODO: find out exactly why propagated is needed here (to build other + # packages depending on zlib): + propagatedBuildInputs = [zlib]; + meta = { + description = "Compression and decompression in the gzip and zlib formats"; + }; +}) diff --git a/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix b/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix new file mode 100644 index 00000000000..dcc41ce9238 --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix @@ -0,0 +1,13 @@ +{cabal, ghcPaths, alex, happy}: + +cabal.mkDerivation (self : { + pname = "haddock"; + version = "2.7.2"; # Haskell Platform 2010.1.0.0 + name = self.fname; + sha256 = "4eaaaf62785f0ba3d37ba356cfac4679faef91c0902d8cdbf42837cbe5daab82"; + extraBuildInputs = [alex happy]; + propagatedBuildInputs = [ghcPaths]; + meta = { + description = "a tool for automatically generating documentation from annotated Haskell source code"; + }; +}) diff --git a/pkgs/development/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix new file mode 100644 index 00000000000..565ecf2f167 --- /dev/null +++ b/pkgs/development/tools/parsing/alex/2.3.2.nix @@ -0,0 +1,12 @@ +{cabal, perl}: + +cabal.mkDerivation (self : { + pname = "alex"; + version = "2.3.2"; # Haskell Platform 2010.1.0.0 + name = self.fname; + sha256 = "6715a4c27b15a74d8f31cbb6a7d654b9cb6766d74980c75b65dee7c627049f43"; + extraBuildInputs = [perl]; + meta = { + description = "A lexical analyser generator for Haskell"; + }; +}) diff --git a/pkgs/tools/package-management/cabal-install/0.8.0.nix b/pkgs/tools/package-management/cabal-install/0.8.0.nix new file mode 100644 index 00000000000..5e9f59f771a --- /dev/null +++ b/pkgs/tools/package-management/cabal-install/0.8.0.nix @@ -0,0 +1,13 @@ +{cabal, HTTP, network, zlib} : + +cabal.mkDerivation (self : { + pname = "cabal-install"; + name = self.fname; + version = "0.8.0"; # Haskell Platform 2010.1.0.0 + sha256 = "6d16618ff454f8d732cad64a53b767b5b6bb95ba4970b260a40e8f467035493c"; + extraBuildInputs = [HTTP network zlib]; + + meta = { + description = "The command-line interface for Cabal and Hackage"; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 399ae41b8bb..6a35af88fae 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -57,6 +57,11 @@ rec { inherit cabal bytestring network; }; + cgi3001172 = import ../development/libraries/haskell/cgi/3001.1.7.2.nix { + inherit cabal mtl parsec xhtml; + network = network2217; + }; + cgi = import ../development/libraries/haskell/cgi { inherit cabal mtl network parsec xhtml; }; @@ -97,6 +102,10 @@ rec { inherit cabal QuickCheck time; }; + deepseq = import ../development/libraries/haskell/deepseq { + inherit cabal; + }; + Diff = import ../development/libraries/haskell/Diff { inherit cabal; }; @@ -144,6 +153,10 @@ rec { inherit cabal pcreLight colorizeHaskell; }; + ghcPaths0106 = import ../development/libraries/haskell/ghc-paths/0.1.0.6.nix { + inherit cabal; + }; + ghcPaths = import ../development/libraries/haskell/ghc-paths { inherit cabal; }; @@ -159,6 +172,14 @@ rec { utf8String xhtml zlib; }; + GLUT2121 = import ../development/libraries/haskell/GLUT/2.1.2.1.nix { + inherit cabal; + OpenGL = OpenGL2230; + glut = pkgs.freeglut; + inherit (pkgs) mesa; + inherit (pkgs.xlibs) libSM libICE libXmu libXi; + }; + GLUT = import ../development/libraries/haskell/GLUT { inherit cabal OpenGL; glut = pkgs.freeglut; @@ -219,14 +240,40 @@ rec { inherit cabal haskellSrcExts; }; + haskellPlatform2010100 = import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix { + inherit cabal ghc fgl + haskellSrc html + stm xhtml happy; + cabalInstall = cabalInstall080; + GLUT = GLUT2121; + OpenGL = OpenGL2230; + zlib = zlib0520; + alex = alex232; + cgi = cgi3001172; + QuickCheck = QuickCheck2; + HTTP = HTTP400009; + HUnit = HUnit1221; + network = network2217; + parallel = parallel2201; + regexBase = regexBase0931; + regexCompat = regexCompat092; + regexPosix = regexPosix0941; + haddock = haddock272; + inherit (pkgs) fetchurl; + }; + haskellPlatform = import ../development/libraries/haskell/haskell-platform { - inherit cabal GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline + inherit cabal ghc GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline haskellSrc html parallel regexBase regexCompat regexPosix stm time xhtml zlib cabalInstall alex happy haddock; - ghc = ghcReal; inherit (pkgs) fetchurl; }; + HTTP400009 = import ../development/libraries/haskell/HTTP/4000.0.9.nix { + inherit cabal mtl parsec; + network = network2217; + }; + HTTP = import ../development/libraries/haskell/HTTP { inherit cabal mtl network parsec; }; @@ -301,6 +348,10 @@ rec { inherit cabal network; }; + HUnit1221 = import ../development/libraries/haskell/HUnit/1.2.2.1.nix { + inherit cabal; + }; + HUnit = import ../development/libraries/haskell/HUnit { inherit cabal; }; @@ -349,6 +400,10 @@ rec { inherit cabal syb; }; + network2217 = import ../development/libraries/haskell/network/2.2.1.7.nix { + inherit cabal parsec; + }; + network = import ../development/libraries/haskell/network { inherit cabal parsec; }; @@ -366,6 +421,12 @@ rec { inherit (pkgs) openal; }; + OpenGL2230 = import ../development/libraries/haskell/OpenGL/2.2.3.0.nix { + inherit cabal; + inherit (pkgs) mesa; + inherit (pkgs.xlibs) libX11; + }; + OpenGL = import ../development/libraries/haskell/OpenGL { inherit cabal; inherit (pkgs) mesa; @@ -376,6 +437,10 @@ rec { inherit cabal mtl network parsec utf8String xhtml zipArchive; }; + parallel2201 = import ../development/libraries/haskell/parallel/2.2.0.1.nix { + inherit cabal deepseq; + }; + parallel = import ../development/libraries/haskell/parallel { inherit cabal; }; @@ -424,14 +489,29 @@ rec { inherit cabal HTTP network xhtml; }; + regexBase0931 = import ../development/libraries/haskell/regex-base/0.93.1.nix { + inherit cabal mtl; + }; + regexBase = import ../development/libraries/haskell/regex-base { inherit cabal mtl; }; + regexCompat092 = import ../development/libraries/haskell/regex-compat/0.92.nix { + inherit cabal; + regexBase = regexBase0931; + regexPosix = regexPosix0941; + }; + regexCompat = import ../development/libraries/haskell/regex-compat { inherit cabal regexBase regexPosix; }; + regexPosix0941 = import ../development/libraries/haskell/regex-posix/0.94.1.nix { + inherit cabal; + regexBase = regexBase0931; + }; + regexPosix = import ../development/libraries/haskell/regex-posix { inherit cabal regexBase; }; @@ -631,6 +711,10 @@ rec { inherit (pkgs) zlib; }; + zlib0520 = import ../development/libraries/haskell/zlib/0.5.2.0.nix { + inherit cabal; + inherit (pkgs) zlib; + }; # Compilers. @@ -657,6 +741,11 @@ rec { inherit (pkgs) perl; }; + alex232 = import ../development/tools/parsing/alex/2.3.2.nix { + inherit cabal; + inherit (pkgs) perl; + }; + cpphs = import ../development/tools/misc/cpphs { inherit cabal; }; @@ -683,6 +772,13 @@ rec { inherit (pkgs) libedit; }; + haddock272 = import ../development/tools/documentation/haddock/haddock-2.7.2.nix { + inherit cabal; + alex = alex232; + happy = happy1184; + ghcPaths = ghcPaths0106; + }; + happy = happy1184; happy117 = import ../development/tools/parsing/happy/happy-1.17.nix { @@ -743,6 +839,13 @@ rec { # Tools. + cabalInstall080 = import ../tools/package-management/cabal-install/0.8.0.nix { + inherit cabal; + HTTP = HTTP400009; + network = network2217; + zlib = zlib0520; + }; + cabalInstall = import ../tools/package-management/cabal-install { inherit cabal HTTP network zlib; }; From 1df704c53341f16d0d1a55b0cddd4b82b4492a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 1 Apr 2010 10:56:50 +0000 Subject: [PATCH 126/313] Fix propagated user environment packages for Cabal builder. svn path=/nixpkgs/trunk/; revision=20905 --- pkgs/development/libraries/haskell/cabal/cabal.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix index 1bda5329c52..7ee0cfcccb9 100644 --- a/pkgs/development/libraries/haskell/cabal/cabal.nix +++ b/pkgs/development/libraries/haskell/cabal/cabal.nix @@ -93,7 +93,7 @@ attrs : fi ensureDir $out/nix-support - ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages + ln -s $out/nix-support/propagated-build-native-inputs $out/nix-support/propagated-user-env-packages eval "$postInstall" ''; From f26e437b72a35951471c2ca8609c0cee7560449c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 1 Apr 2010 12:34:50 +0000 Subject: [PATCH 127/313] Don't depend on X unless djview3 is requested Also rename option name to "qt3" svn path=/nixpkgs/trunk/; revision=20908 --- pkgs/applications/misc/djvulibre/default.nix | 7 +++++-- pkgs/lib/maintainers.nix | 1 + pkgs/top-level/all-packages.nix | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 59c4552b7b3..e40accf8b44 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, lib, config, libjpeg, libtiff, libpng, ghostscript +, libungif, zlib, x11, libX11, mesa, qt3 }: stdenv.mkDerivation { name = "djvulibre-3.5.22"; @@ -8,10 +9,12 @@ stdenv.mkDerivation { sha256 = "1gphi67qiq1ky7k8vymkwcgla80cwy8smk1rla6grxdqipwl54ix"; }; - buildInputs = [qt libX11 libjpeg libtiff libpng ghostscript zlib libungif x11 mesa]; + buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++ + (if config "qt3" true then [qt3 libX11 x11 mesa] else []); meta = { description = "A library and viewer for the DJVU file format for scanned images"; homepage = http://djvu.sourceforge.net; + maintainers = [ lib.maintainers.urkud ]; }; } diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 191930f9ceb..678c061eb87 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -14,5 +14,6 @@ raskin = "Michael Raskin <7c6f434c@mail.ru>"; simons = "Peter Simons "; sander = "Sander van der Burg "; + urkud = "Yury G. Kudryashov "; viric = "Lluís Batlle i Rossell "; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c459fc1bc74..4302b45dc4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7072,9 +7072,9 @@ let }; djvulibre = import ../applications/misc/djvulibre { - inherit stdenv fetchurl libjpeg libtiff libungif zlib - ghostscript libpng x11 mesa; - qt = if (getConfig ["djvulibre" "qt3Frontend"] true) then qt3 else null; + inherit stdenv fetchurl lib libjpeg libtiff libungif qt3 zlib + ghostscript libpng mesa x11; + config = getPkgConfig "djvulibre"; inherit (xlibs) libX11; }; From 5306038df719309b1fd34f30c349317ad509742e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 1 Apr 2010 13:34:36 +0000 Subject: [PATCH 128/313] Move KDE 3 packages into kde3 set Use kde3.kile instead of kile etc. svn path=/nixpkgs/trunk/; revision=20910 --- pkgs/top-level/all-packages.nix | 164 +++++++++++++++++--------------- 1 file changed, 85 insertions(+), 79 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4302b45dc4b..9f2495134c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -703,11 +703,6 @@ let inherit fetchurl stdenv; }; - filelight = import ../tools/system/filelight { - inherit fetchurl stdenv kdelibs x11 zlib perl libpng; - qt = qt3; - }; - findutils = useFromStdenv "findutils" (if stdenv.isDarwin then findutils4227 else import ../tools/misc/findutils { @@ -1582,12 +1577,6 @@ let suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { }; - superkaramba = import ../desktops/superkaramba { - inherit stdenv fetchurl kdebase kdelibs zlib libjpeg - perl qt3 python libpng freetype expat; - inherit (xlibs) libX11 libXext libXt libXaw libXpm; - }; - ssmtp = import ../tools/networking/ssmtp { inherit fetchurl stdenv openssl; tlsSupport = true; @@ -3127,12 +3116,6 @@ let inherit fetchurl stdenv; }; - kcachegrind = import ../development/tools/misc/kcachegrind { - inherit fetchurl stdenv kdelibs zlib perl expat libpng libjpeg; - inherit (xlibs) libX11 libXext libSM; - qt = qt3; - }; - lcov = import ../development/tools/analysis/lcov { inherit fetchurl stdenv perl; }; @@ -3347,14 +3330,6 @@ let bdbSupport = true; }; - arts = import ../development/libraries/arts { - inherit fetchurl stdenv pkgconfig; - inherit (xlibs) libX11 libXext; - inherit kdelibs zlib libjpeg libpng perl; - qt = qt3; - inherit (gnome) glib; - }; - aspell = import ../development/libraries/aspell { inherit fetchurl stdenv perl; }; @@ -7065,12 +7040,6 @@ let inherit (gtkLibs) gtk glib; }; - digikam = import ../applications/graphics/digikam { - inherit stdenv fetchurl exiv2 zlib libjpeg perl libpng expat qt3 cmake; - inherit (kde3) kdelibs; - inherit (xlibs) libXt libXext; - }; - djvulibre = import ../applications/misc/djvulibre { inherit stdenv fetchurl lib libjpeg libtiff libungif qt3 zlib ghostscript libpng mesa x11; @@ -7283,12 +7252,6 @@ let inherit (gnome) libgnome libgnomeui vte; }; - gwenview = import ../applications/graphics/gwenview { - inherit stdenv fetchurl exiv2 zlib libjpeg perl libpng expat qt3; - inherit (kde3) kdelibs; - inherit (xlibs) libXt libXext; - }; - wavesurfer = import ../applications/misc/audio/wavesurfer { inherit fetchurl stdenv tcl tk snack makeWrapper; }; @@ -7663,16 +7626,6 @@ let inherit (xlibs) libX11 libXext libXinerama libXpm libXft; }; - k3b = import ../applications/misc/k3b { - inherit stdenv fetchurl kdelibs x11 zlib libpng libjpeg perl qt3; - }; - - kbasket = import ../applications/misc/kbasket { - inherit fetchurl kdelibs x11 zlib libpng libjpeg - perl qt3 gpgme libgpgerror; - stdenv = overrideGCC stdenv gcc43; - }; - kermit = import ../tools/misc/kermit { inherit fetchurl stdenv ncurses; }; @@ -7688,31 +7641,6 @@ let # inherit ffmpeg2theora sox, vorbis-tools lame mjpegtools dvdauthor 'Q'dvdauthor growisofs mencoder; }; - kile = import ../applications/editors/kile { - inherit stdenv fetchurl perl arts kdelibs zlib libpng libjpeg freetype expat; - inherit (xlibs) libX11 libXt libXext libXrender libXft; - qt = qt3; - }; - - konversation = import ../applications/networking/irc/konversation { - inherit fetchurl stdenv perl arts kdelibs zlib libpng libjpeg expat; - inherit (xlibs) libX11 libXt libXext libXrender libXft; - qt = qt3; - }; - - kphone = import ../applications/networking/kphone { - inherit fetchurl lib autoconf automake libtool pkgconfig openssl libpng alsaLib; - qt = qt3; - inherit (xlibs) libX11 libXext libXt libICE libSM; - stdenv = overrideGCC stdenv gcc42; # I'm to lazy to clean up header files - }; - - kuickshow = import ../applications/graphics/kuickshow { - inherit fetchurl stdenv kdelibs arts libpng libjpeg libtiff libungif imlib expat perl; - inherit (xlibs) libX11 libXext libSM; - qt = qt3; - }; - lame = import ../applications/audio/lame { inherit fetchurl stdenv; }; @@ -8205,8 +8133,8 @@ let inherit (xlibs) libX11 libXext libSM libICE; # KDE support is not working yet. - inherit kdelibs kdebase; - withKde = pkgs.getConfig ["taskJuggler" "kde"] false; + inherit (kde3) kdelibs kdebase; + withKde = getPkgConfig "taskJuggler" "kde" false; }; thinkingRock = import ../applications/misc/thinking-rock { @@ -8794,11 +8722,93 @@ let kdebase = import ../desktops/kde-3/kdebase { inherit fetchurl pkgconfig x11 xlibs zlib libpng libjpeg perl - kdelibs openssl bzip2 fontconfig pam hal dbus glib; + openssl bzip2 fontconfig pam hal dbus glib; stdenv = overrideGCC stdenv gcc43; + inherit (kde3) kdelibs; qt = qt3; }; + arts = import ../development/libraries/arts { + inherit fetchurl stdenv pkgconfig; + inherit (xlibs) libX11 libXext; + inherit zlib libjpeg libpng perl; + qt = qt3; + inherit (gnome) glib; + inherit (kde3) kdelibs; + }; + + gwenview = import ../applications/graphics/gwenview { + inherit stdenv fetchurl exiv2 zlib libjpeg perl libpng expat qt3; + inherit (kde3) kdelibs; + inherit (xlibs) libXt libXext; + }; + + digikam = import ../applications/graphics/digikam { + inherit stdenv fetchurl exiv2 zlib libjpeg perl libpng expat qt3 cmake; + inherit (kde3) kdelibs; + inherit (xlibs) libXt libXext; + }; + + k3b = import ../applications/misc/k3b { + inherit stdenv fetchurl x11 zlib libpng libjpeg perl qt3; + inherit (kde3) kdelibs; + }; + + kbasket = import ../applications/misc/kbasket { + inherit fetchurl x11 zlib libpng libjpeg + perl qt3 gpgme libgpgerror; + stdenv = overrideGCC stdenv gcc43; + inherit (kde3) kdelibs; + }; + + kile = import ../applications/editors/kile { + inherit stdenv fetchurl perl zlib libpng libjpeg freetype expat; + inherit (xlibs) libX11 libXt libXext libXrender libXft; + inherit (kde3) arts kdelibs; + qt = qt3; + }; + + konversation = import ../applications/networking/irc/konversation { + inherit fetchurl stdenv perl zlib libpng libjpeg expat; + inherit (xlibs) libX11 libXt libXext libXrender libXft; + inherit (kde3) arts kdelibs; + qt = qt3; + }; + + kphone = import ../applications/networking/kphone { + inherit fetchurl lib autoconf automake libtool pkgconfig openssl libpng alsaLib; + qt = qt3; + inherit (xlibs) libX11 libXext libXt libICE libSM; + stdenv = overrideGCC stdenv gcc42; # I'm to lazy to clean up header files + }; + + kuickshow = import ../applications/graphics/kuickshow { + inherit fetchurl stdenv libpng libjpeg libtiff libungif imlib expat perl; + inherit (xlibs) libX11 libXext libSM; + inherit (kde3) arts kdelibs; + qt = qt3; + }; + + kcachegrind = import ../development/tools/misc/kcachegrind { + inherit fetchurl stdenv zlib perl expat libpng libjpeg; + inherit (xlibs) libX11 libXext libSM; + inherit (kde3) kdelibs; + qt = qt3; + }; + + filelight = import ../tools/system/filelight { + inherit fetchurl stdenv x11 zlib perl libpng; + inherit (kde3) kdelibs; + qt = qt3; + }; + + superkaramba = import ../desktops/superkaramba { + inherit stdenv fetchurl zlib libjpeg + perl qt3 python libpng freetype expat; + inherit (xlibs) libX11 libXext libXt libXaw libXpm; + inherit (kde3) kdelibs kdebase; + }; + }; kde4 = kde44; @@ -8817,10 +8827,6 @@ let pyqt4 = pyqt47; }); - - kdelibs = kde3.kdelibs; - kdebase = kde3.kdebase; - ### SCIENCE xplanet = import ../applications/science/xplanet { From 94de02e04e911edfc960d7a88827a1f7fbc389fc Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 1 Apr 2010 13:46:07 +0000 Subject: [PATCH 129/313] Move kde3 packages into kde3 in release.nix svn path=/nixpkgs/trunk/; revision=20911 --- pkgs/top-level/release.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 93b25598622..35a9de63c7c 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -158,13 +158,9 @@ with (import ./release-lib.nix); jfsrec = linux; jnettop = linux; jwhois = linux; - k3b = linux; kbd = linux; - kcachegrind = linux; keen4 = ["i686-linux"]; - kile = linux; klibc = linux; - konversation = linux; ktorrent = linux; kvm = linux; qemu = linux; @@ -425,6 +421,10 @@ with (import ./release-lib.nix); kde3 = { kdebase = linux; kdelibs = linux; + k3b = linux; + kcachegrind = linux; + kile = linux; + konversation = linux; }; kde43 = { From 16ef66f67ed432fa334bd9f16570ae6cf0a65e6b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 1 Apr 2010 14:21:18 +0000 Subject: [PATCH 130/313] Recurse into kde4 attrs svn path=/nixpkgs/trunk/; revision=20912 --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f2495134c7..900f191146f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8811,7 +8811,12 @@ let }; - kde4 = kde44; + kde4 = recurseIntoAttrs ( + if (getPkgConfig "kde" "version" "4.4") == "4.4" then + kde44 + else + kde43 + ); kde43 = makeOverridable (import ../desktops/kde-4.3) (pkgs // { openexr = openexr_1_6_1; From d1a7c6e39fbd8d4ac8dfdbe974d955f82716fdde Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Apr 2010 14:41:51 +0000 Subject: [PATCH 131/313] * Don't use nested lists. svn path=/nixpkgs/trunk/; revision=20914 --- pkgs/development/perl-modules/generic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 91b0500eeaa..96094ab4e53 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -1,6 +1,6 @@ perl: -attrs: +{ buildInputs ? [], ... } @ attrs: perl.stdenv.mkDerivation ( { @@ -22,6 +22,6 @@ perl.stdenv.mkDerivation ( { name = "perl-" + attrs.name; builder = ./builder.sh; - buildInputs = [(if attrs ? buildInputs then attrs.buildInputs else []) perl]; + buildInputs = buildInputs ++ [ perl ]; } ) From 4597b33ed18ff10f1be5ffc39c19d4daed664940 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 1 Apr 2010 14:49:05 +0000 Subject: [PATCH 132/313] Update Disnix packages to use the 0.1 release svn path=/nixpkgs/trunk/; revision=20915 --- .../disnix/DisnixService/default.nix | 33 ++++++++++--------- .../disnix/activation-scripts/default.nix | 12 +++---- .../package-management/disnix/default.nix | 14 ++++---- pkgs/top-level/all-packages.nix | 6 ++-- 4 files changed, 32 insertions(+), 33 deletions(-) diff --git a/pkgs/tools/package-management/disnix/DisnixService/default.nix b/pkgs/tools/package-management/disnix/DisnixService/default.nix index e1c7cb2c845..1aece565099 100644 --- a/pkgs/tools/package-management/disnix/DisnixService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixService/default.nix @@ -1,18 +1,21 @@ -{stdenv, fetchsvn, jdk, apacheAnt, axis2, shebangfix}: +{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}: stdenv.mkDerivation { - name = "DisnixService-0.1"; - src = fetchsvn { - url = https://svn.nixos.org/repos/nix/disnix/DisnixService/trunk; - md5 = "019e4485e02b65a3402e885592cdd7f5"; - rev = 12653; - }; - - buildInputs = [ jdk apacheAnt axis2 shebangfix ]; - builder = ./builder.sh; - inherit axis2; - - meta = { - license = "LGPL"; - }; + name = "DisnixService-0.1"; + src = fetchurl { + url = http://hydra.nixos.org/build/337920/download/1/DisnixService-0.1.tar.bz2; + sha256 = "18526dh5axmicbahwma2m71hw7j0nkxmmhgl4kd76r61wdiiblx7"; + }; + buildInputs = [ apacheAnt ]; + PREFIX = ''''${env.out}''; + AXIS2_LIB = "${axis2}/lib"; + AXIS2_WEBAPP = "${axis2}/webapps/axis2"; + DBUS_JAVA_LIB = "${dbus_java}/share/java"; + patchPhase = '' + sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \ + -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \ + scripts/disnix-soap-client + ''; + buildPhase = "ant"; + installPhase = "ant install"; } diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix index 0ec33d1a759..2719e611b1a 100644 --- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix +++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix @@ -1,11 +1,9 @@ -{stdenv, fetchsvn, autoconf, automake}: +{stdenv, fetchurl}: stdenv.mkDerivation { - name = "disnix-activation-scripts-nixos"; - src = fetchsvn { - url = https://svn.nixos.org/repos/nix/disnix/disnix-activation-scripts-nixos/trunk; - sha256 = "3ba44fbd2c00da6dd1926513184db89c1f3557c55af5c3a4041e85fb6d1a5758"; + name = "disnix-activation-scripts-test"; + src = fetchurl { + url = http://hydra.nixos.org/build/333630/download/1/disnix-activation-scripts-nixos-0.1.tar.gz; + sha256 = "0izkkdw9r2gff03mq973ah5b9b0a4b07l8ac0406yv8ss9vaaclm"; }; - buildInputs = [ autoconf automake ]; - preConfigure = "./bootstrap"; } diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 10113d04a78..e9b9e722c87 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,12 +1,10 @@ -{stdenv, fetchsvn, autoconf, automake, libtool, pkgconfig, dbus_glib, openssl, libxml2}: +{stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable}: stdenv.mkDerivation { - name = "disnix"; - src = fetchsvn { - url = https://svn.nixos.org/repos/nix/disnix/disnix/trunk; - sha256 = "4397dc0bf4b4ecca795784d0011eb631538b17bd81e77b84bf15d89bf85e94bb"; - rev = 16924; + name = "disnix-0.1"; + src = fetchurl { + url = http://hydra.nixos.org/build/334661/download/1/disnix-0.1.tar.gz; + sha256 = "0qiskbgn49dihhicczsbjandwjnz04yhnlxgwjinkcyfzsh4yqdp"; }; - buildInputs = [ autoconf automake libtool pkgconfig dbus_glib openssl libxml2 ]; - preConfigure = "./bootstrap"; + buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 900f191146f..993fba54431 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9159,15 +9159,15 @@ let }; disnix = import ../tools/package-management/disnix { - inherit stdenv fetchsvn openssl autoconf automake libtool pkgconfig dbus_glib libxml2; + inherit stdenv fetchurl pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable; }; disnix_activation_scripts = import ../tools/package-management/disnix/activation-scripts { - inherit stdenv fetchsvn autoconf automake; + inherit stdenv fetchurl; }; DisnixService = import ../tools/package-management/disnix/DisnixService { - inherit stdenv fetchsvn apacheAnt jdk axis2 shebangfix; + inherit stdenv fetchurl apacheAnt jdk axis2 dbus_java; }; latex2html = import ../misc/tex/latex2html/default.nix { From 525274bd94091a52e785fc2162479040f068771c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Apr 2010 14:52:14 +0000 Subject: [PATCH 133/313] xz: Fix x86_64-darwin builds. svn path=/nixpkgs/trunk/; revision=20916 --- pkgs/tools/compression/xz/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index b65a86a06b3..2285d91e039 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, lib}: -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "xz-4.999.9beta"; src = fetchurl { @@ -15,3 +15,11 @@ stdenv.mkDerivation { maintainers = [ lib.maintainers.sander ]; }; } + +// + +(if stdenv.system == "x86_64-darwin" + # Work around assembler misconfiguration as `x86'. This appears to be fixed + # by commit b9b5c54cd438b3ae47b44cc211b71f3bc53e35ef (Nov 22 12:00:30 2009 # +0200). + then { configureFlags = "--enable-assembler=x86_64"; } + else {})) From 766add2f8a1eb2d11a21ed793dd060f3d95fef3b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 1 Apr 2010 15:17:22 +0000 Subject: [PATCH 134/313] Really use djvulibre parameter svn path=/nixpkgs/trunk/; revision=20919 --- pkgs/desktops/kde-4.4/graphics/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.4/graphics/default.nix b/pkgs/desktops/kde-4.4/graphics/default.nix index fb6edd83975..c95db63c557 100644 --- a/pkgs/desktops/kde-4.4/graphics/default.nix +++ b/pkgs/desktops/kde-4.4/graphics/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { }; buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib shared_mime_info stdenv.gcc.libc libXxf86vm - kdelibs automoc4 phonon strigi qimageblitz soprano qca2 ]; + kdelibs automoc4 phonon strigi qimageblitz soprano qca2 + djvulibre]; meta = { description = "KDE graphics utilities"; longDescription = '' From 4a6cfd435e9ef9a0ac6871fcf9d4b02a7fdfaefa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 1 Apr 2010 18:19:44 +0000 Subject: [PATCH 135/313] Removing a part of the cmake setup-hook that broke at least the findqt4 cmake module. That way, we don't need the patch anymore to fix what that part broke. Also kde stops needing the findqt4 patch (for its own copy of the findqt4 cmake module). I tested a nixos-rebuild with kde4, and it builds as far as hydra built with this configuration. svn path=/nixpkgs/trunk/; revision=20921 --- pkgs/desktops/kde-4.4/libs/default.nix | 4 ---- pkgs/desktops/kde-4.4/libs/findqt4.patch | 13 ------------- .../kde-4.4/support/qimageblitz/default.nix | 1 - .../tools/build-managers/cmake/default.nix | 2 -- .../tools/build-managers/cmake/findqt4.patch | 13 ------------- .../tools/build-managers/cmake/setup-hook.sh | 1 - 6 files changed, 34 deletions(-) delete mode 100644 pkgs/desktops/kde-4.4/libs/findqt4.patch delete mode 100644 pkgs/development/tools/build-managers/cmake/findqt4.patch diff --git a/pkgs/desktops/kde-4.4/libs/default.nix b/pkgs/desktops/kde-4.4/libs/default.nix index 84ee7a59627..896c444d10e 100644 --- a/pkgs/desktops/kde-4.4/libs/default.nix +++ b/pkgs/desktops/kde-4.4/libs/default.nix @@ -11,10 +11,6 @@ stdenv.mkDerivation { url = mirror://kde/stable/4.4.2/src/kdelibs-4.4.2.tar.bz2; sha256 = "02kcw716hmkcvsz7sc823m7lzkmacb526fajkq54gxqa6fc2yr15"; }; - - # The same way as cmake needed a patch for findqt4 to work properly under nix, - # also KDE, because they have their own copy of cmake's findqt4. - patches = [ ./findqt4.patch ]; buildInputs = [ cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt diff --git a/pkgs/desktops/kde-4.4/libs/findqt4.patch b/pkgs/desktops/kde-4.4/libs/findqt4.patch deleted file mode 100644 index a8ba8e31794..00000000000 --- a/pkgs/desktops/kde-4.4/libs/findqt4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/modules/FindQt4.cmake b/cmake/modules/FindQt4.cmake -index 86622fd..e15b3fa 100644 ---- a/cmake/modules/FindQt4.cmake -+++ b/cmake/modules/FindQt4.cmake -@@ -727,6 +727,8 @@ IF (QT4_QMAKE_FOUND) - FOREACH(QT_MODULE ${QT_MODULES}) - STRING(TOUPPER ${QT_MODULE} _upper_qt_module) - FIND_PATH(QT_${_upper_qt_module}_INCLUDE_DIR ${QT_MODULE} -+ NO_CMAKE_PATH -+ NO_CMAKE_ENVIRONMENT_PATH - PATHS - ${QT_HEADERS_DIR}/${QT_MODULE} - ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers diff --git a/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix b/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix index 3e352b1f027..b03301e76e8 100644 --- a/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix +++ b/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation { patchPhase = '' cp ${cmake}/share/cmake-${cmake.majorVersion}/Modules/FindQt4.cmake cmake/modules ''; - patches = [ ../../libs/findqt4.patch ]; buildInputs = [ cmake qt4 ]; meta = { description = "Graphical effect and filter library for KDE4"; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index ecf7deafd35..4158c737612 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { sha256 = "0va7kxczqb920n61xnyhr99ajs4v05mssk4n0p6z55yvr9g62zc4"; }; - patches = [ ./findqt4.patch ]; - postUnpack = '' dontUseCmakeConfigure=1 source $setupHook diff --git a/pkgs/development/tools/build-managers/cmake/findqt4.patch b/pkgs/development/tools/build-managers/cmake/findqt4.patch deleted file mode 100644 index 43fa5591506..00000000000 --- a/pkgs/development/tools/build-managers/cmake/findqt4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake -index 3bb77d1..7fdbe4a 100644 ---- a/Modules/FindQt4.cmake -+++ b/Modules/FindQt4.cmake -@@ -579,6 +579,8 @@ IF (QT4_QMAKE_FOUND) - FOREACH(QT_MODULE ${QT_MODULES}) - STRING(TOUPPER ${QT_MODULE} _upper_qt_module) - FIND_PATH(QT_${_upper_qt_module}_INCLUDE_DIR ${QT_MODULE} -+ NO_CMAKE_PATH -+ NO_CMAKE_ENVIRONMENT_PATH - PATHS - ${QT_HEADERS_DIR}/${QT_MODULE} - ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 49a4ad7fd90..71afcefe3cb 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -9,7 +9,6 @@ fixCmakeFiles() local replaceArgs echo "fixing cmake files" replaceArgs="-e -f -L -T /usr /FOO" - replaceArgs="$replaceArgs -a NO_DEFAULT_PATH \"\" -a NO_SYSTEM_PATH \"\"" find $1 -type f -name "*.cmake" -print0 | xargs -0 replace-literal ${replaceArgs} } From c3e38d11f0937e61dba673e369b333b7e08921af Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 1 Apr 2010 18:50:43 +0000 Subject: [PATCH 136/313] Bump libarchive to 2.8.3 Fixes kdeutils-4.4.2 compilation svn path=/nixpkgs/trunk/; revision=20922 --- pkgs/development/libraries/libarchive/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 744554c338f..9782948ba53 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,14 +1,15 @@ -{fetchurl, stdenv, zlib, bzip2, e2fsprogs, sharutils}: +{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, xz, e2fsprogs +, sharutils}: stdenv.mkDerivation rec { - name = "libarchive-2.4.12"; + name = "libarchive-2.8.3"; src = fetchurl { - url = "${meta.homepage}/src/${name}.tar.gz"; - sha256 = "133kxx1wfangrhy6rcpqlqib7i45qxj8pcp3i9n574cwfx41swy4"; + url = "http://libarchive.googlecode.com/files/${name}.tar.gz"; + sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a"; }; - propagatedBuildInputs = [zlib bzip2 e2fsprogs]; + propagatedBuildInputs = [acl libxml2 zlib bzip2 e2fsprogs xz attr openssl]; buildInputs = [sharutils]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 993fba54431..275c5a9f706 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4133,7 +4133,8 @@ let }; libarchive = import ../development/libraries/libarchive { - inherit fetchurl stdenv zlib bzip2 e2fsprogs sharutils; + inherit fetchurl stdenv acl zlib bzip2 e2fsprogs xz sharutils libxml2 + openssl attr; }; libassuan = import ../development/libraries/libassuan { From 7531041ca4d29c90dbbf94084e1dd1758b5d80ba Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 2 Apr 2010 07:11:56 +0000 Subject: [PATCH 137/313] Fix install if /etc/vim exists Also fix all .py files, not only those going to $out/bin svn path=/nixpkgs/trunk/; revision=20924 --- pkgs/tools/typesetting/asciidoc/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 1eb56c76991..f0cfab00d42 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -8,12 +8,15 @@ stdenv.mkDerivation rec { }; patchPhase = '' - for n in asciidoc.py a2x.py; do + for n in `find . -name \*.py `; do sed -i -e "s,^#!/usr/bin/env python,#!${python}/bin/python,g" "$n" chmod +x "$n" done + sed -i -e "s,/etc/vim,,g" Makefile.in ''; + preInstall = "ensureDir $out/etc/vim"; + buildInputs = [ python ]; meta = { From 7af927d96b6b6f5241220beac146883e7a5e7718 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 2 Apr 2010 07:17:11 +0000 Subject: [PATCH 138/313] Improve git-svn support svn path=/nixpkgs/trunk/; revision=20925 --- .../git-and-tools/default.nix | 19 ++++++++----------- .../git-and-tools/git/default.nix | 9 +++++---- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index cf24e21db0e..eb1fe3f29a1 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -3,7 +3,8 @@ */ args: with args; with pkgs; let - inherit (pkgs) stdenv fetchurl getConfig subversion; + inherit (pkgs) stdenv fetchurl subversion; + config = getPkgConfig "git"; in rec { @@ -12,9 +13,9 @@ rec { asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl tk makeWrapper subversion; - svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support - guiSupport = getConfig ["git" "guiSupport"] false; - perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; + svnSupport = config "svnSupport" false; # for git-svn support + guiSupport = config "guiSupport" false; + perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; }; # The full-featured Git. @@ -25,11 +26,7 @@ rec { cpio tcl tk makeWrapper; svnSupport = true; guiSupport = true; - perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; - # gitFull requires subversion with perlBindings enabled at least - subversion = pkgs.subversion.override { - perlBindings = true; - }; + perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; }; gitGit = import ./git/git-git.nix { @@ -37,8 +34,8 @@ rec { asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl tk makeWrapper subversion autoconf; - svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support - guiSupport = getConfig ["git" "guiSupport"] false; + svnSupport = config "svnSupport" false; # for git-svn support + guiSupport = config "guiSupport" false; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; }; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 7e4e903f2c7..aae8676b9c3 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -6,8 +6,9 @@ , pythonSupport ? true }: -# `git-svn' support requires Subversion and various Perl libraries. -assert svnSupport -> (subversion != null && perlLibs != [] && subversion.perlBindings); +let + svn = subversion.override { perlBindings = true; }; +in stdenv.mkDerivation rec { name = "git-1.7.0.3"; @@ -49,12 +50,12 @@ stdenv.mkDerivation rec { ''# wrap git-svn gitperllib=$out/lib/perl5/site_perl - for i in ${builtins.toString perlLibs}; do + for i in ${builtins.toString perlLibs} ${svn}; do gitperllib=$gitperllib:$i/lib/perl5/site_perl done wrapProgram "$out/libexec/git-core/git-svn" \ --set GITPERLLIB "$gitperllib" \ - --prefix PATH : "${subversion}/bin" '' + --prefix PATH : "${svn}/bin" '' else '' # replace git-svn by notification script notSupported $out/bin/git-svn "reinstall with config git = { svnSupport = true } set" '') From 284c448d129be94756648e9815535060c95e55ab Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 2 Apr 2010 07:43:02 +0000 Subject: [PATCH 139/313] Fix gitFull build svn path=/nixpkgs/trunk/; revision=20926 --- pkgs/applications/version-management/git-and-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index eb1fe3f29a1..282dec88c4c 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -23,7 +23,7 @@ rec { inherit fetchurl stdenv curl openssl zlib expat perl python gettext asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt - cpio tcl tk makeWrapper; + cpio tcl tk makeWrapper subversion; svnSupport = true; guiSupport = true; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; From b01b22892b6a00a33af967789fe6e2679413beb0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 2 Apr 2010 12:39:38 +0000 Subject: [PATCH 140/313] Use override for gitFull svn path=/nixpkgs/trunk/; revision=20927 --- .../version-management/git-and-tools/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 282dec88c4c..fc998a8b23b 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -8,7 +8,7 @@ let in rec { - git = import ./git { + git = lib.makeOverridable (import ./git) { inherit fetchurl stdenv curl openssl zlib expat perl python gettext asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt @@ -19,14 +19,9 @@ rec { }; # The full-featured Git. - gitFull = import ./git rec { - inherit fetchurl stdenv curl openssl zlib expat perl python gettext - asciidoc texinfo xmlto docbook2x - docbook_xsl docbook_xml_dtd_45 libxslt - cpio tcl tk makeWrapper subversion; + gitFull = git.override { svnSupport = true; guiSupport = true; - perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; }; gitGit = import ./git/git-git.nix { From 98cfefe7eaf4d154520d52fa17202c0b11955e12 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 2 Apr 2010 15:25:21 +0000 Subject: [PATCH 141/313] Upgrade shared-mime-info svn path=/nixpkgs/trunk/; revision=20928 --- pkgs/data/misc/shared-mime-info/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 0ab2a902281..d30572f2ce5 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -2,11 +2,11 @@ , libxml2, glib}: stdenv.mkDerivation rec { - name = "shared-mime-info-0.51"; + name = "shared-mime-info-0.71"; src = fetchurl { url = "http://freedesktop.org/~hadess/${name}.tar.bz2"; - sha256 = "1n7fn3vnqdq5c4xjyflwryxdb75cwsmw39hdpjy90swd841pw90w"; + sha256 = "1d8f97f17de77ae0d8a3a4ef357280ef444da87f4ce19170392712d0c2f6d04f"; }; buildInputs = [ From e523ba17327c463cb009ddaa4fc12562fa54ac77 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 3 Apr 2010 09:53:38 +0000 Subject: [PATCH 142/313] Add libiodbc Use experimental style. Will revert to "standard" one if needed. svn path=/nixpkgs/trunk/; revision=20929 --- .../libraries/libiodbc/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/libiodbc/default.nix diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix new file mode 100644 index 00000000000..2899547a215 --- /dev/null +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -0,0 +1,22 @@ +a: + +let + inherit (a) stdenv fetchurl pkgconfig cg; + inherit (a.gtkLibs) gtk; +in + +stdenv.mkDerivation rec { + name = "libiodbc-3.52.7"; + + src = fetchurl { + url = "${meta.homepage}/downloads/iODBC/${name}.tar.gz"; + sha256 = "d7002cc7e566785f1203f6096dcb49b0aad02a9d9946a8eca5d663ac1a85c0c7"; + }; + + buildInputs = if cg "gtk" false then [ gtk pkgconfig ] else []; + + meta = { + description = "iODBC driver manager"; + homepage = http://www.iodbc.org; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 275c5a9f706..7db3a233121 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4280,6 +4280,9 @@ let inherit stdenv fetchurl perl; }; + libiodbc = makeOverridable (import ../development/libraries/libiodbc) + (pkgs // { cg = getPkgConfig "libiodbc"; }); + libnice = import ../development/libraries/libnice { inherit stdenv fetchurl pkgconfig; inherit (gnome) glib; From f0f195883056f53e3c2b87d17fbef9a7af2796bb Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 3 Apr 2010 09:54:22 +0000 Subject: [PATCH 143/313] Get rid of redland-1.0.8 1.0.9 was buggy, but it is fixed in 1.0.10 svn path=/nixpkgs/trunk/; revision=20930 --- pkgs/desktops/kde-4.3/default.nix | 3 +- pkgs/desktops/kde-4.4/default.nix | 3 +- pkgs/development/libraries/redland/1.0.10.nix | 11 +----- pkgs/development/libraries/redland/1.0.8.nix | 35 ------------------- pkgs/top-level/all-packages.nix | 10 +----- 5 files changed, 4 insertions(+), 58 deletions(-) delete mode 100644 pkgs/development/libraries/redland/1.0.8.nix diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index d6e19d4f6c3..6b0ecc5aeef 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -23,8 +23,7 @@ pkgs.recurseIntoAttrs (rec { soprano = import ./support/soprano { inherit (pkgs) stdenv fetchurl lib cmake; - inherit (pkgs) qt4 cluceneCore; - redland = pkgs.redland_1_0_8; + inherit (pkgs) qt4 cluceneCore redland; }; qimageblitz = import ./support/qimageblitz { diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 775239376d8..95e40bc2ae1 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -23,8 +23,7 @@ pkgs.recurseIntoAttrs (rec { soprano = import ./support/soprano { inherit (pkgs) stdenv fetchurl lib cmake; - inherit (pkgs) qt4 cluceneCore; - redland = pkgs.redland_1_0_8; + inherit (pkgs) qt4 cluceneCore redland; }; qimageblitz = import ./support/qimageblitz { diff --git a/pkgs/development/libraries/redland/1.0.10.nix b/pkgs/development/libraries/redland/1.0.10.nix index 141094a8160..959581d407e 100644 --- a/pkgs/development/libraries/redland/1.0.10.nix +++ b/pkgs/development/libraries/redland/1.0.10.nix @@ -22,14 +22,5 @@ stdenv.mkDerivation rec { [ "--with-threads" ] ++ stdenv.lib.optional (bdb != null) "--with-bdb=${bdb}"; - patchPhase = - '' - sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl - - # Redland 1.0.9 uses an internal pre-processor symbol SQLITE_API - # that collides with a symbol of the same name in sqlite 3.6.19. - # This is a quick fix for the problem. A real solution needs to be - # implemented upstream, though. - find . -type f -exec sed -i -e 's/SQLITE_API/REDLAND_SQLITE_API/g' {} \; - ''; + patchPhase ="sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl"; } diff --git a/pkgs/development/libraries/redland/1.0.8.nix b/pkgs/development/libraries/redland/1.0.8.nix deleted file mode 100644 index 6d0294ee394..00000000000 --- a/pkgs/development/libraries/redland/1.0.8.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl -, curl, pcre, libxml2, librdf_rasqal, librdf_raptor -, mysql ? null, postgresql ? null, sqlite ? null, bdb ? null -}: - -stdenv.mkDerivation rec { - name = "redland-1.0.8"; - - src = fetchurl { - url = "mirror://sf/librdf/${name}.tar.gz"; - sha256 = "8a77fcfd20fea2c6e53761d6dcbbee3fdb35e5308de36c1daa0d2014e5a96afe"; - }; - - buildInputs = [ pkgconfig ]; - - propagatedBuildInputs = - [ bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2 - librdf_rasqal librdf_raptor - ]; - - configureFlags = - [ "--with-threads" ] - ++ stdenv.lib.optional (bdb != null) "--with-bdb=${bdb}"; - - patchPhase = - '' - sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl - - # Redland 1.0.9 uses an internal pre-processor symbol SQLITE_API - # that collides with a symbol of the same name in sqlite 3.6.19. - # This is a quick fix for the problem. A real solution needs to be - # implemented upstream, though. - find . -type f -exec sed -i -e 's/SQLITE_API/REDLAND_SQLITE_API/g' {} \; - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7db3a233121..c194daac135 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4912,15 +4912,7 @@ let inherit fetchurl stdenv lib pkgconfig librdf_raptor ladspaH openssl zlib; }; - redland = redland_1_0_10; - - redland_1_0_8 = makeOverridable (import ../development/libraries/redland/1.0.8.nix) { - inherit fetchurl stdenv openssl libxml2 pkgconfig perl sqlite - libxslt curl pcre librdf_rasqal librdf_raptor; - bdb = db4; - }; - - redland_1_0_10 = makeOverridable (import ../development/libraries/redland/1.0.10.nix) { + redland = makeOverridable (import ../development/libraries/redland/1.0.10.nix) { inherit fetchurl stdenv openssl libxml2 pkgconfig perl sqlite mysql libxslt curl pcre librdf_rasqal librdf_raptor; bdb = db4; From fd94e443d24665a040cd9a9812ecf8b834a63af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 3 Apr 2010 10:59:26 +0000 Subject: [PATCH 144/313] Adding recurseIntoAttrs for the kde3 attribute set, to have the derivations available listed by nix-env. svn path=/nixpkgs/trunk/; revision=20931 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c194daac135..65cf066a936 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8704,7 +8704,7 @@ let gnome = gnome28; - kde3 = { + kde3 = recurseIntoAttrs { kdelibs = import ../desktops/kde-3/kdelibs { inherit From d22cb2fdb5852937e4451e91f4a31fed18ff95c8 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 3 Apr 2010 17:34:14 +0000 Subject: [PATCH 145/313] Add virtuoso database Very minimal installation needed by KDE svn path=/nixpkgs/trunk/; revision=20932 --- pkgs/servers/sql/virtuoso/default.nix | 30 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/servers/sql/virtuoso/default.nix diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/default.nix new file mode 100644 index 00000000000..c533da3f1d4 --- /dev/null +++ b/pkgs/servers/sql/virtuoso/default.nix @@ -0,0 +1,30 @@ +a: +let + inherit (a) stdenv fetchurl libxml2 openssl readline; +in + +stdenv.mkDerivation rec { + name = "virtuoso-opensource-6.1.0"; + + src = fetchurl { + url = "mirror://sf/virtuoso/${name}.tar.gz"; + sha256 = "1kwsb4j7k1a4mnbpjzn4hpg3bwx0bjndan5x8ffpagk5ardqi5b4"; + }; + + buildInputs = [ libxml2 openssl readline ]; + + CPP="${stdenv.gcc}/bin/gcc -E"; + + configureFlags=" + --enable-shared --disable-all-vads --with-readline=${readline} + --disable-hslookup --disable-wbxml2 --without-iodbc + --enable-openssl=${openssl} + "; + + postInstall='' + echo Move documentation + mkdir $out/share/doc + mv $out/share/virtuoso/doc $out/share/doc/${name} + find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65cf066a936..45e62480dbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5631,6 +5631,8 @@ let inherit fetchurl stdenv jdk apacheAnt unzip; }; + virtuoso = makeOverridable (import ../servers/sql/virtuoso) pkgs; + vsftpd = import ../servers/ftp/vsftpd { inherit fetchurl openssl stdenv libcap pam; }; From 39c24a480171bf1de3c4cfc63d0eda2c7bd913c6 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 3 Apr 2010 17:34:26 +0000 Subject: [PATCH 146/313] Bump soprano to 2.4.1 Add virtuoso backend. Another full KDE rebuild. svn path=/nixpkgs/trunk/; revision=20933 --- pkgs/desktops/kde-4.4/default.nix | 2 +- pkgs/desktops/kde-4.4/support/soprano/default.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 95e40bc2ae1..fece15ad111 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -23,7 +23,7 @@ pkgs.recurseIntoAttrs (rec { soprano = import ./support/soprano { inherit (pkgs) stdenv fetchurl lib cmake; - inherit (pkgs) qt4 cluceneCore redland; + inherit (pkgs) qt4 cluceneCore redland libiodbc; }; qimageblitz = import ./support/qimageblitz { diff --git a/pkgs/desktops/kde-4.4/support/soprano/default.nix b/pkgs/desktops/kde-4.4/support/soprano/default.nix index 28c9af52d52..f8610093f2c 100644 --- a/pkgs/desktops/kde-4.4/support/soprano/default.nix +++ b/pkgs/desktops/kde-4.4/support/soprano/default.nix @@ -1,20 +1,20 @@ -{stdenv, fetchurl, lib, cmake, qt4, cluceneCore, redland}: +{stdenv, fetchurl, lib, cmake, qt4, cluceneCore, redland, libiodbc}: -stdenv.mkDerivation { - name = "soprano-2.4.0.1"; +stdenv.mkDerivation rec { + name = "soprano-2.4.1"; src = fetchurl { - url = mirror://sourceforge/soprano/soprano-2.4.0.1.tar.bz2; - sha256 = "0124i92g3vky9wm8ripy3x4gnf1c4pz2hklisds9vld6ylj8gsa6"; + url = "mirror://sf/soprano/${name}.tar.bz2"; + sha256 = "1ghwjbcrbwhq0in61a47iaxcja50r9axsg9cv97x2myprrqa43bj"; }; # We disable the Java backends, since we do not need them and they make the closure size much bigger - buildInputs = [ cmake qt4 cluceneCore redland ]; + buildInputs = [ cmake qt4 cluceneCore redland libiodbc ]; meta = { homepage = http://soprano.sourceforge.net/; description = "An object-oriented C++/Qt4 framework for RDF data"; license = "LGPL"; - maintainers = [ lib.maintainers.sander ]; + maintainers = with lib.maintainers; [ sander urkud ]; }; } From bb8a2181ada9a5eaadf4807f99e4af1c7d61f6ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 3 Apr 2010 22:07:59 +0000 Subject: [PATCH 147/313] Updating kismet svn path=/nixpkgs/trunk/; revision=20934 --- .../networking/sniffers/kismet/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 37db2dde0ed..a7831785db8 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, libpcap, ncurses, expat}: +{stdenv, fetchurl, libpcap, ncurses, expat, pcre}: stdenv.mkDerivation { - name = "kismet-2008-05-r1"; + name = "kismet-2010-01-r1"; src = fetchurl { - url = http://www.kismetwireless.net/code/kismet-2008-05-R1.tar.gz; - sha256 = "a298d44f8a6ec977021cd492a720987ded81b5c4baf5f68b36f1282a23c9f7d3"; + url = http://www.kismetwireless.net/code/kismet-2010-01-R1.tar.gz; + sha256 = "106qird64x1v29nz6k5zs9dxxdq6q7fb7d6np0pnwm3dd2p1w7cx"; }; - buildInputs = [libpcap ncurses expat]; + buildInputs = [libpcap ncurses expat pcre]; postConfigure = "sed -e 's@-o \$(INSTUSR)@@' \\ -e 's@-g \$(INSTGRP)@@' \\ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45e62480dbf..83cfc589dbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -990,7 +990,7 @@ let }; kismet = import ../applications/networking/sniffers/kismet { - inherit fetchurl stdenv libpcap ncurses expat; + inherit fetchurl stdenv libpcap ncurses expat pcre; }; ktorrent = import ../tools/networking/p2p/ktorrent { From c68b4a9297c7ac4fda3fbfe2f898b1158b4df948 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 3 Apr 2010 23:01:36 +0000 Subject: [PATCH 148/313] pkgs/games/warsow: Now mesa will be added to RPATH. Small cleanup. svn path=/nixpkgs/trunk/; revision=20935 --- pkgs/games/warsow/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index e3d17e855d5..5b6850b24ac 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -19,10 +19,9 @@ stdenv.mkDerivation rec { cd source unzip $src2 'basewsw/*' -d release ''; - inherit openal; patchPhase = '' - substituteInPlace Makefile --replace "openal-config" "pkg-config openal" - substituteInPlace snd_openal/snd_main.c --replace libopenal.so.0 $openal/lib/libopenal.so + substituteInPlace Makefile --replace openal-config 'pkg-config openal' + substituteInPlace snd_openal/snd_main.c --replace libopenal.so.0 ${openal}/lib/libopenal.so ''; buildInputs = [ unzip pkgconfig zlib curl libjpeg libvorbis libXxf86dga libXxf86vm libXinerama SDL mesa openal ]; @@ -38,6 +37,11 @@ stdenv.mkDerivation rec { cp -rv basewsw libs $dest cp -v warsow wsw_server wswtv_server $out/bin ''; + postFixup = '' + p=$out/opt/warsow/warsow.* + cur_rpath=$(patchelf --print-rpath $p) + patchelf --set-rpath $cur_rpath:${mesa}/lib $p + ''; meta = { description = "A multiplayer FPS designed for competitive gaming."; longDescription = '' From 589aeb4c0037abf585995983b08074ade5f8402d Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 4 Apr 2010 14:44:14 +0000 Subject: [PATCH 149/313] update to 2.4 svn path=/nixpkgs/trunk/; revision=20936 --- pkgs/tools/networking/axel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 2fff18534c4..0ee01850940 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "axel-1.0b"; + name = "axel-2.4"; src = fetchurl { - url = http://wilmer.gaast.net/downloads/axel-1.0b.tar.gz; - sha256 = "1m3s3nviqi6n6iy7nzrdp31zn8pp6g923clsxf6m7yi1jfa1bifa"; + url = https://alioth.debian.org/frs/download.php/3016/axel-2.4.tar.bz2; + sha256 = "ebc7d40e989c680d2afa632a17e5208101608924cf446da20814a6f3c3338612"; }; meta = { From 155515f0767a8cb824441779e4c98275fa7f5d61 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 4 Apr 2010 14:51:37 +0000 Subject: [PATCH 150/313] update to 2.0.19 svn path=/nixpkgs/trunk/; revision=20937 --- pkgs/tools/networking/gftp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index 20b8cad5ed6..852e6a25e90 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -1,10 +1,10 @@ args: with args; stdenv.mkDerivation { - name = "gftp-2.0.18"; + name = "gftp-2.0.19"; src = fetchurl { - url = http://www.gftp.org/gftp-2.0.18.tar.bz2; - sha256 = "8145e18d1edf13e8cb6cd7a69bb69de5c46307086997755654488fb8282d38a2"; + url = http://www.gftp.org/gftp-2.0.19.tar.bz2; + sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; }; buildInputs = [ gtk readline ncurses gettext openssl pkgconfig ]; @@ -12,6 +12,6 @@ stdenv.mkDerivation { meta = { description = "GTK based FTP client"; homepage = http://www.gftp.org; - license = "GPL"; + license = "GPLv2+"; }; } From f7ab7efff1cf9bf01330075e0c1058fdef5fbb75 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 4 Apr 2010 14:57:26 +0000 Subject: [PATCH 151/313] update tcpdump to 4.1.0, libpcap to 1.1.0 svn path=/nixpkgs/trunk/; revision=20938 --- pkgs/development/libraries/libpcap/default.nix | 4 ++-- pkgs/tools/networking/tcpdump/default.nix | 6 ++---- .../tools/networking/tcpdump/disable-ipv6.patch | 17 ----------------- 3 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 pkgs/tools/networking/tcpdump/disable-ipv6.patch diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 0b91460e8e3..0c20c44ef90 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { - name = "libpcap-1.0.0"; + name = "libpcap-1.1.0"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552"; + sha256 = "073hy17pvm203c0z3zpkp1b37sblcgf49c6a03az7kbniizbc07b"; }; buildNativeInputs = [ flex bison ]; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 939bc400eae..640b305591e 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.0.0"; + name = "tcpdump-4.1.0"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "112j0d12l5zsq56akn4n23i98pwblfb7qhblk567ddbl0bz9xsaz"; + sha256 = "1yhmz23cb0qx16nwnmyk2v7nnqai20lzcc4lx34v728qdpkmc1in"; }; buildInputs = [ libpcap ]; - patches = [ ./disable-ipv6.patch ]; - crossAttrs = { LDFLAGS = if enableStatic then "-static" else ""; configureFlags = [ "ac_cv_linux_vers=2" ] ++ (stdenv.lib.optional diff --git a/pkgs/tools/networking/tcpdump/disable-ipv6.patch b/pkgs/tools/networking/tcpdump/disable-ipv6.patch deleted file mode 100644 index 0c869369faa..00000000000 --- a/pkgs/tools/networking/tcpdump/disable-ipv6.patch +++ /dev/null @@ -1,17 +0,0 @@ -Needed for proper building with ipv6 disabled -http://marc.info/?l=tcpdump-workers&m=122606195828825&w=2 ---- a/print-enc.c 2008-11-04 16:24:30 +0000 -+++ b/print-enc.c 2008-11-04 16:45:04 +0000 -@@ -77,9 +77,11 @@ - case AF_INET: - ip_print(gndo, p, length); - break; -+#ifdef INET6 - case AF_INET6: - ip6_print(p, length); - break; -+#endif /*INET6*/ - } - - out: - From 355413e0a5b272185d163cb55d52bb1340727a58 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 4 Apr 2010 15:00:56 +0000 Subject: [PATCH 152/313] update to 436 svn path=/nixpkgs/trunk/; revision=20939 --- pkgs/tools/misc/less/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index f4a7bc0cf5d..b22e7521764 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation { - name = "less-418"; + name = "less-436"; src = fetchurl { - url = http://www.greenwoodsoftware.com/less/less-418.tar.gz; - sha256 = "1d03n4wx8y1gmf2m8yawzg6ixmfrixcai5l14p9pj8q13gbgqcpm"; + url = http://www.greenwoodsoftware.com/less/less-436.tar.gz; + sha256 = "1lilcx6qrfr2dqahv7r10j9h2v86w5sb7m8wrx2sza9ifkq6z8ap"; }; buildInputs = [ncurses]; From 8cd4c577aa2c972128851c88e2be38ed9d38778e Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 4 Apr 2010 15:03:47 +0000 Subject: [PATCH 153/313] update to 4.0.3 svn path=/nixpkgs/trunk/; revision=20940 --- pkgs/tools/misc/screen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index f8c49bed673..39e763c4ca7 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation { - name = "screen-4.0.2"; + name = "screen-4.0.3"; src = fetchurl { - url = mirror://gnu/screen/screen-4.0.2.tar.gz; - md5 = "ed68ea9b43d9fba0972cb017a24940a1"; + url = mirror://gnu/screen/screen-4.0.3.tar.gz; + sha256 = "0xvckv1ia5pjxk7fs4za6gz2njwmfd54sc464n8ab13096qxbw3q"; }; buildInputs = [ncurses]; From a6237e569105598ed59c6175797cc5705f6f6e23 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 4 Apr 2010 15:20:28 +0000 Subject: [PATCH 154/313] update to 5.21 svn path=/nixpkgs/trunk/; revision=20941 --- pkgs/tools/security/nmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index cef43a2adcf..4a5627072ca 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation (rec { - name = "nmap-5.00"; + name = "nmap-5.21"; src = fetchurl { url = "http://nmap.org/dist/${name}.tar.bz2"; - sha256 = "0k91x31js5kzfxhil3m53k2ylks1pvbccllc99n31vc1dryri2xq"; + sha256 = "1fmh05iamynmr8zic3bja6dr0pfiwp0hr2nc2wpiqm2pc7w29jwz"; }; postInstall ='' From e37d850227e9b3320c35fc6cc732b2774840bc95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 4 Apr 2010 18:01:36 +0000 Subject: [PATCH 155/313] Updating the nvidia legacy drivers, so they build with linux 2.6.33 svn path=/nixpkgs/trunk/; revision=20943 --- pkgs/os-specific/linux/nvidia-x11/legacy.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy.nix b/pkgs/os-specific/linux/nvidia-x11/legacy.nix index f3a2c49811b..58db507f622 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy.nix @@ -2,7 +2,7 @@ let - versionNumber = "96.43.14"; + versionNumber = "96.43.16"; in @@ -15,12 +15,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "0v93ijdpgh3vpbhrikzync6pws5i471ykqbpp7gahv7hf51z61kr"; + sha256 = "1vcc11wxpxi1az61x2djxx60lx0dkb2vn303jjbw967qra64agi4"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; - sha256 = "0m5gj8wb1w5rwh2qi5bvkxlwy9igwfjifjyyqkd17x0v0rw6iyhr"; + sha256 = "1bczsfx6ck9bj6yki89bm753k4qbdc3ac8hs26h507z6nh06v2l1"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From 8807722e17b9002f11be849f8b12fb133525119c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 5 Apr 2010 14:09:22 +0000 Subject: [PATCH 156/313] Adding xdm svn path=/nixpkgs/trunk/; revision=20947 --- pkgs/servers/x11/xorg/default.nix | 10 ++++++++++ pkgs/servers/x11/xorg/extra.list | 1 + 2 files changed, 11 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9c5609b79f3..95c29dea28e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1206,6 +1206,16 @@ let }; buildInputs = [pkgconfig libXcursor ]; })) // {inherit libXcursor ;}; + + xdm = (stdenv.mkDerivation ((if overrides ? xdm then overrides.xdm else x: x) { + name = "xdm-1.1.9"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xdm-1.1.9.tar.bz2; + sha256 = "0d5i25mn6vzhkh5ga5b403hgfmaf66q40knr06ii608d3c7dpcg7"; + }; + buildInputs = [pkgconfig libXmu libX11 libXau libXinerama libXft libXpm libXaw libXdmcp libXt libXext]; + })) // {inherit libXmu libX11 libXau libXinerama libXft libXpm libXaw libXdmcp libXt libXext;}; xdpyinfo = (stdenv.mkDerivation ((if overrides ? xdpyinfo then overrides.xdpyinfo else x: x) { name = "xdpyinfo-1.1.0"; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 83118fe0fc4..e930e14e801 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -3,3 +3,4 @@ http://xcb.freedesktop.org/dist/xcb-util-0.3.6.tar.bz2 http://xcb.freedesktop.org/dist/libxcb-1.4.tar.bz2 http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 mirror://xorg/individual/lib/pixman-0.16.4.tar.bz2 +mirror://xorg/individual/app/xdm-1.1.9.tar.bz2 From 882e258fbc01deac7bad86474ddb12a93dde26f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 5 Apr 2010 16:04:50 +0000 Subject: [PATCH 157/313] Updating firefox. For xulrunner, I moved the version number up too; I don't know what did I have to do with it. svn path=/nixpkgs/trunk/; revision=20948 --- pkgs/applications/networking/browsers/firefox/3.6.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix index 5d926c92a66..c3f16f72aee 100644 --- a/pkgs/applications/networking/browsers/firefox/3.6.nix +++ b/pkgs/applications/networking/browsers/firefox/3.6.nix @@ -12,14 +12,14 @@ rec { - firefoxVersion = "3.6.2"; + firefoxVersion = "3.6.3"; - xulVersion = "1.9.2.2"; # this attribute is used by other packages + xulVersion = "1.9.2.3"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "7befdbcc2bd658c136bdce1c1bd8b54201c1d1d1"; + sha256 = "1l5290l1jrglvih0957iv8xn5sxmqklx67kqqnv059dsg5fv781m"; }; From 21cae80fed1c0df08e58eadad4105fe26159d689 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Apr 2010 09:45:37 +0000 Subject: [PATCH 158/313] svn path=/nixpkgs/trunk/; revision=20951 --- pkgs/desktops/gnome-2.28/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index f25a6064285..7a1e66a8890 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -12,6 +12,7 @@ rec { # !!! Missing! Need to add these. libgnomeprintui = throw "libgnomeprintui not implemented"; + gnomepanel = throw "gnomepanel not implemented"; gtksourceview_24 = gtksourceview; From 5330be5fbb7cac454cb443a3fed7012258d556bc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Apr 2010 10:33:49 +0000 Subject: [PATCH 159/313] * Latest Linux kernels. svn path=/nixpkgs/trunk/; revision=20952 --- pkgs/os-specific/linux/kernel/linux-2.6.27.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-2.6.33.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix index 06790b2a215..054718d8f60 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix @@ -3,11 +3,11 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "", ... }: import ./generic.nix ( rec { - version = "2.6.27.45"; + version = "2.6.27.46"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "0hv4pa83ff8kihvjwhxkx01yf5dfrvk9xkn1bzhr9m0rv3s8d6sy"; + sha256 = "185pniphacd1vfam9qianrw8ibjw1rjlds7hikxxmimfn029q3nv"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index 91c4c1e904c..954e580f356 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -199,11 +199,11 @@ in import ./generic.nix ( rec { - version = "2.6.32.10"; + version = "2.6.32.11"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "04d8rwvpv0hy0il3wzk2yc7ah72jkdxnym7h7k3ib0csjhfvh2y9"; + sha256 = "0zqf8ihsw454acj186m1bham1ahpcf0q616sgb00wngz3qif22cw"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.33.nix b/pkgs/os-specific/linux/kernel/linux-2.6.33.nix index fb763a2b266..34fa3e2f9fc 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.33.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.33.nix @@ -197,11 +197,11 @@ in import ./generic.nix ( rec { - version = "2.6.33.1"; + version = "2.6.33.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1c9fnhmjg5vbixxqcbb8648x3asgmxgh5m25zla4417b3dfawqc0"; + sha256 = "105xjc8dadqry97qgbnwbnrk4n86cjgf9rdyjp1ljcaifkj9qwva"; }; config = configWithPlatform stdenv.platform; From 2aac41a8dbc4dd1385cc3cf0db22ea1f9702546b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Apr 2010 10:50:52 +0000 Subject: [PATCH 160/313] * libiodbc: don't pass all of Nixpkgs to the package. There is no reason why this shouldn't work, but it breaks NixOS evaluation on x86_64-linux with weird segfaults and assertion failures, probably due to a bug in the evaluator or the ATerm library. svn path=/nixpkgs/trunk/; revision=20953 --- pkgs/development/libraries/libiodbc/default.nix | 9 ++------- pkgs/top-level/all-packages.nix | 7 +++++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 2899547a215..fb3a2fd11d0 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,9 +1,4 @@ -a: - -let - inherit (a) stdenv fetchurl pkgconfig cg; - inherit (a.gtkLibs) gtk; -in +{ stdenv, fetchurl, pkgconfig, gtk, useGTK ? false }: stdenv.mkDerivation rec { name = "libiodbc-3.52.7"; @@ -13,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "d7002cc7e566785f1203f6096dcb49b0aad02a9d9946a8eca5d663ac1a85c0c7"; }; - buildInputs = if cg "gtk" false then [ gtk pkgconfig ] else []; + buildInputs = stdenv.lib.optionals useGTK [ gtk pkgconfig ]; meta = { description = "iODBC driver manager"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83cfc589dbd..7a411eceea8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4280,8 +4280,11 @@ let inherit stdenv fetchurl perl; }; - libiodbc = makeOverridable (import ../development/libraries/libiodbc) - (pkgs // { cg = getPkgConfig "libiodbc"; }); + libiodbc = makeOverridable (import ../development/libraries/libiodbc) { + inherit stdenv fetchurl pkgconfig; + inherit (gtkLibs) gtk; + useGTK = getPkgConfig "libiodbc" "gtk" false; + }; libnice = import ../development/libraries/libnice { inherit stdenv fetchurl pkgconfig; From f6c28984f2568e3eee4ce988364075a31636b4f3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Apr 2010 13:24:46 +0000 Subject: [PATCH 161/313] Update netpbm svn path=/nixpkgs/trunk/; revision=20956 --- pkgs/tools/graphics/netpbm/default.nix | 8 +++----- pkgs/tools/graphics/netpbm/rgbpaths.patch | 16 ---------------- 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 pkgs/tools/graphics/netpbm/rgbpaths.patch diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 568762e3ded..a9d3b5c394c 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -1,16 +1,14 @@ {stdenv, fetchsvn, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper }: stdenv.mkDerivation { - name = "netpbm-advanced-844"; + name = "netpbm-advanced-1177"; src = fetchsvn { url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced; - rev = 844; - sha256 = "8729e63bb5cc9fd500a68d5aed91fa4b973ebc068e3014b47390ba7b4d85968e"; + rev = 1177; + sha256 = "d8893599fcb7839025e7fbe24120928b4bbcd70f0e1034a21d91885c40a5c39f"; }; - patches = [ ./rgbpaths.patch ]; - NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; buildInputs = [ flex zlib perl libpng libjpeg libxml2 makeWrapper ]; diff --git a/pkgs/tools/graphics/netpbm/rgbpaths.patch b/pkgs/tools/graphics/netpbm/rgbpaths.patch deleted file mode 100644 index 0e6baa78bfe..00000000000 --- a/pkgs/tools/graphics/netpbm/rgbpaths.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur advanced.orig/pm_config.in.h advanced/pm_config.in.h ---- advanced.orig/pm_config.in.h 2010-01-12 22:04:07.000000000 +0100 -+++ advanced/pm_config.in.h 2010-01-12 22:05:56.000000000 +0100 -@@ -67,9 +67,9 @@ - #define RGB_DB2 "PBMplus_Dir:RGB.TXT" - #define RGB_DB3 "PBMplus_Dir:RGB.TXT" - #else --#define RGB_DB1 "/usr/lib/X11/rgb.txt" --#define RGB_DB2 "/usr/share/X11/rgb.txt" --#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" -+#define RGB_DB1 "@rgbPath1@" -+#define RGB_DB2 "@rgbPath2@" -+#define RGB_DB3 "@rgbPath3@" - #endif - - /* CONFIGURE: This is the name of an environment variable that tells From 99fda7a42f8296bba0e0033ccad1c7f27e7d8d6c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 6 Apr 2010 13:27:32 +0000 Subject: [PATCH 162/313] Do not pass pkgs to virtuoso svn path=/nixpkgs/trunk/; revision=20958 --- pkgs/servers/sql/virtuoso/default.nix | 5 +---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/default.nix index c533da3f1d4..6730ce26fcd 100644 --- a/pkgs/servers/sql/virtuoso/default.nix +++ b/pkgs/servers/sql/virtuoso/default.nix @@ -1,7 +1,4 @@ -a: -let - inherit (a) stdenv fetchurl libxml2 openssl readline; -in +{ stdenv, fetchurl, libxml2, openssl, readline }: stdenv.mkDerivation rec { name = "virtuoso-opensource-6.1.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a411eceea8..f34c4f6fc53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5634,7 +5634,9 @@ let inherit fetchurl stdenv jdk apacheAnt unzip; }; - virtuoso = makeOverridable (import ../servers/sql/virtuoso) pkgs; + virtuoso = makeOverridable (import ../servers/sql/virtuoso) { + inherit stdenv fetchurl libxml2 openssl readline; + }; vsftpd = import ../servers/ftp/vsftpd { inherit fetchurl openssl stdenv libcap pam; From 1b2c0d3326385e6e61edd97a39d30ce69bdc5856 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Apr 2010 17:30:51 +0000 Subject: [PATCH 163/313] Try updating OO.o - old tarball unavailable anyway svn path=/nixpkgs/trunk/; revision=20960 --- pkgs/applications/office/openoffice/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index 08a536fe151..74c331cbe84 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -6,21 +6,23 @@ , libXinerama, openssl, gperf, cppunit, GConf, ORBit2 }: -let version = "3.1.1"; in +let version = "3.2.0"; in stdenv.mkDerivation rec { name = "openoffice.org-${version}"; builder = ./builder.sh; + downloadRoot = "http://download.services.openoffice.org/files/stable"; + src = fetchurl { - url = "http://mirror.kernelerror.net/openoffice/stable/${version}/OOo_${version}_src_core.tar.bz2"; - sha256 = "95440f09f8dce616178b86b26af8e543c869d01579207aa68e8474019b59caca"; + url = "${downloadRoot}/${version}/OOo_${version}_src_core.tar.bz2"; + sha256 = "b44ab94c75b89c9354531ddba9c211374567535e147308a934e8c35d7b26814a"; }; patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ]; src_system = fetchurl { - url = "http://mirror.kernelerror.net/openoffice/stable/${version}/OOo_${version}_src_system.tar.bz2"; - sha256 = "bb4a440ca91a40cd2b5692abbc19e8fbd3d311525edb266dc5cd9ebc324f2b4a"; + url = "${downloadRoot}/${version}/OOo_${version}_src_system.tar.bz2"; + sha256 = "97796333eb2f17e8199026d4ab4334d59bbbffc8d2f9d9100a0c27e823e1305a"; }; configureFlags = " From 3cc371de23f4bc24ab2a93ff3df5160ff1a76bcf Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Apr 2010 19:04:43 +0000 Subject: [PATCH 164/313] Try removing old patches svn path=/nixpkgs/trunk/; revision=20961 --- pkgs/applications/office/openoffice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index 74c331cbe84..2da50c42916 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "b44ab94c75b89c9354531ddba9c211374567535e147308a934e8c35d7b26814a"; }; - patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ]; + patches = [ /* ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch */ ./root-required.patch ]; src_system = fetchurl { url = "${downloadRoot}/${version}/OOo_${version}_src_system.tar.bz2"; From 788e40bd5a3434d859e0b937aa0c9c3b40519adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 6 Apr 2010 19:39:25 +0000 Subject: [PATCH 165/313] Updating some py-gtk things. With a newer glib, I could have used a newer pyobject. svn path=/nixpkgs/trunk/; revision=20962 --- pkgs/development/python-modules/pycairo/default.nix | 6 +++--- pkgs/development/python-modules/pygobject/default.nix | 6 +++--- pkgs/development/python-modules/pygtk/default.nix | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 1f1ff8a37f9..8aebf1d7829 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, python, pkgconfig, cairo, x11}: stdenv.mkDerivation { - name = "pycairo-1.4.0"; + name = "pycairo-1.8.8"; src = fetchurl { - url = http://cairographics.org/releases/pycairo-1.4.0.tar.gz; - sha256 = "0cky2iw3ccbqh96y5ypbrxmmaj1jmdcmlss0k6p3jzkjxvzsy4lj"; + url = http://cairographics.org/releases/pycairo-1.8.8.tar.gz; + sha256 = "0q18hd4ai4raljlvd76ylgi30kxpr2qq83ka6gzwh0ya8fcmjlig"; }; buildInputs = [python pkgconfig cairo x11]; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index e1128355303..4007b721011 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, python, pkgconfig, glib}: stdenv.mkDerivation { - name = "pygobject-2.12.3"; + name = "pygobject-2.20.0"; src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-2.12.3.tar.bz2; - sha256 = "0hfsd7ln7j67w0vyrszic9b3d97gddad1y9arjw8i2b6h411xa7g"; + url = http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.20/pygobject-2.20.0.tar.bz2; + sha256 = "10gsf3i2q9y659hayxyaxyfz7inswcjc8m6iyqckwsj2yjij7sa1"; }; buildInputs = [python pkgconfig glib]; diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index a0d4eba644b..76b50372ca2 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -2,11 +2,11 @@ , libglade ? null}: stdenv.mkDerivation { - name = "pygtk-2.10.4"; + name = "pygtk-2.16.0"; src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.10/pygtk-2.10.4.tar.bz2; - sha256 = "1xg8vng42lql29aa5ryva8icc8dwdc7h2y3yn96qjdgl394d96mb"; + url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.16/pygtk-2.16.0.tar.bz2; + sha256 = "1a24fkxslir8zb800hs4ix9iyvgqsy5c6hdfirrh2yi1mw0mxbkz"; }; buildInputs = [python pkgconfig glib gtk] From 3c2c4ac87a11b6b522dc69663d373a3c6349dbf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 6 Apr 2010 19:39:29 +0000 Subject: [PATCH 166/313] Adding 'meld' svn path=/nixpkgs/trunk/; revision=20963 --- .../version-management/meld/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/version-management/meld/default.nix diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix new file mode 100644 index 00000000000..9a4c58d11c4 --- /dev/null +++ b/pkgs/applications/version-management/meld/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }: + +stdenv.mkDerivation { + name = "meld-1.3.1"; + + src = fetchurl { + url = http://ftp.gnome.org/pub/gnome/sources/meld/1.3/meld-1.3.1.tar.bz2; + sha256 = "0iqnj3qb9l7z12akgmf64fr2xqirsqxflvj60xqcqr5vd5c763nn"; + }; + + buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ]; + + patchPhase = '' + sed -e s,/usr/local,$out, -i INSTALL + sed -e 's,#!.*,#!${python}/bin/python,' -i meld + ''; + + postInstall = '' + wrapProgram $out/bin/meld --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0 + ''; + + meta = { + description = "Visual diff and merge tool"; + homepage = http://meld.sourceforge.net; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f34c4f6fc53..2fb62c64dbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7686,6 +7686,12 @@ let qt = qt4; }; + meld = import ../applications/version-management/meld { + inherit fetchurl stdenv python intltool makeWrapper; + inherit (gnome) scrollkeeper; + pygtk = pyGtkGlade; + }; + mercurial = import ../applications/version-management/mercurial { inherit fetchurl stdenv makeWrapper getConfig tk; guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg) From f7880c95a3e647a3adabda99859a01d68964b320 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Apr 2010 21:46:52 +0000 Subject: [PATCH 167/313] Roll back OO.o version; subscribe to build results svn path=/nixpkgs/trunk/; revision=20964 --- pkgs/applications/office/openoffice/builder.sh | 2 ++ pkgs/applications/office/openoffice/default.nix | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh index 7e61505a63c..848afe96210 100644 --- a/pkgs/applications/office/openoffice/builder.sh +++ b/pkgs/applications/office/openoffice/builder.sh @@ -10,6 +10,8 @@ postUnpack() { } preConfigure() { + ./configure --help + for i in sysui/desktop/share/makefile.mk; do substituteInPlace $i --replace /bin/bash $shell done diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index 2da50c42916..3edd4e5b3f8 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -6,7 +6,7 @@ , libXinerama, openssl, gperf, cppunit, GConf, ORBit2 }: -let version = "3.2.0"; in +let version = "3.1.1"; in stdenv.mkDerivation rec { name = "openoffice.org-${version}"; builder = ./builder.sh; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "b44ab94c75b89c9354531ddba9c211374567535e147308a934e8c35d7b26814a"; }; - patches = [ /* ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch */ ./root-required.patch ]; + patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ]; src_system = fetchurl { url = "${downloadRoot}/${version}/OOo_${version}_src_system.tar.bz2"; @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { --without-system-hunspell --without-system-altlinuxhyph --without-system-lpsolve + --without-system-graphite "; LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib"; @@ -77,5 +78,6 @@ stdenv.mkDerivation rec { description = "OpenOffice.org is a multiplatform and multilingual office suite"; homepage = http://www.openoffice.org/; license = "LGPL"; + maintainers = [ stdenv.lib.maintainers.raskin ]; }; } From 7e2ce26e0958248164b9a71c6ea69d5f3abfe672 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 7 Apr 2010 13:59:34 +0000 Subject: [PATCH 168/313] Upgraded koffice to 2.1.2 svn path=/nixpkgs/trunk/; revision=20970 --- pkgs/desktops/kde-4.4/extragear/koffice/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix b/pkgs/desktops/kde-4.4/extragear/koffice/default.nix index c440b712087..c3281f354be 100644 --- a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/koffice/default.nix @@ -3,10 +3,10 @@ , kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen}: stdenv.mkDerivation { - name = "koffice-2.1.1"; + name = "koffice-2.1.2"; src = fetchurl { - url = mirror://kde/stable/koffice-2.1.1/koffice-2.1.1.tar.bz2; - sha256 = "00dcdb68ykcf7yblq68rxh1ldi70irsxzbcgh36aadzgk0k8r4pz"; + url = mirror://kde/stable/koffice-2.1.2/koffice-2.1.2.tar.bz2; + sha256 = "1nmp2kmksk6vjw9bk04lnl8ld43hf4s0ras6vali725innvkn8v4"; }; buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info poppler gsl gmm wv2 libwpd From 7b9ccbd457404ee346fe335c50f82b0a47b3a4ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 7 Apr 2010 15:04:04 +0000 Subject: [PATCH 169/313] Updating freeimage. svn path=/nixpkgs/trunk/; revision=20972 --- pkgs/development/libraries/freeimage/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index f13eadfa574..ec402b6bee0 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "freeimage-3.13.0"; + name = "freeimage-3.13.1"; src = fetchurl { - url = mirror://sourceforge/freeimage/FreeImage3130.zip; - sha256 = "0hf642cb1bai1j4izvjnmili9ic335awa4jnn6nxa0bv6wfaa9x2"; + url = mirror://sourceforge/freeimage/FreeImage3131.zip; + sha256 = "1ilpfgyi3qhjra5hxvjcrq3bna909bgdl7rgmhkybmcpdq1x56rj"; }; buildInputs = [ unzip ]; patchPhase = '' From 7f6b1e9abd5dd14c4cb304b06f55c72bc87a6b19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 7 Apr 2010 15:53:34 +0000 Subject: [PATCH 170/313] GCC 4.4: Fix shared library support of sparc64-linux-gnu cross-compiler. svn path=/nixpkgs/trunk/; revision=20975 --- .../development/compilers/gcc-4.4/default.nix | 3 ++- .../compilers/gcc-4.4/pr41818.patch | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/compilers/gcc-4.4/pr41818.patch diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index 9ec2c485992..b1b7aaa3360 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -120,7 +120,8 @@ stdenv.mkDerivation ({ # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. ++ optional langAda ./gnat-cflags.patch - ++ optional langVhdl ./ghdl-ortho-cflags.patch; + ++ optional langVhdl ./ghdl-ortho-cflags.patch + ++ optional (cross != null && cross.arch == "sparc64") ./pr41818.patch; inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic libcCross; diff --git a/pkgs/development/compilers/gcc-4.4/pr41818.patch b/pkgs/development/compilers/gcc-4.4/pr41818.patch new file mode 100644 index 00000000000..98731c46067 --- /dev/null +++ b/pkgs/development/compilers/gcc-4.4/pr41818.patch @@ -0,0 +1,26 @@ +From . This fixes compilation +of the sparc64-linux-gnu cross-compiler with shared libraries. + +--- trunk/Makefile.in 2010/01/07 19:21:46 155705 ++++ trunk/Makefile.in 2010/01/07 19:53:50 155706 +@@ -259,7 +259,7 @@ + # directories built for the target. + TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)" + # This is the list of variables to export in the environment when +-# configuring subdirectories for the host system. ++# configuring subdirectories for the target system. + BASE_TARGET_EXPORTS = \ + $(BASE_EXPORTS) \ + AR="$(AR_FOR_TARGET)"; export AR; \ +@@ -281,7 +281,10 @@ + STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ + WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \ +- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); ++@if gcc-bootstrap ++ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ ++@endif gcc-bootstrap ++ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); + + RAW_CXX_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fb62c64dbf..f10e7a3a278 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1988,9 +1988,6 @@ let libcCross = libcCross; profiledCompiler = false; enableMultilib = false; - # cross-building for ultrasparc in 4.4.3 will require disabling shared due to a gcc bug. - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818 - enableShared = if (crossSystem.arch == "sparc64") then false else true; crossStageStatic = false; cross = assert crossSystem != null; crossSystem; }); From e80351a49df68bedd27bab4020c717d5fa835e98 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 9 Apr 2010 11:26:54 +0000 Subject: [PATCH 171/313] Update nginx svn path=/nixpkgs/trunk/; revision=20988 --- pkgs/servers/http/nginx/default.nix | 3 +++ pkgs/servers/http/nginx/src-for-default.nix | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index ec7e200df53..d86f38e1863 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -3,6 +3,7 @@ let s = import ./src-for-default.nix; buildInputs = with a; [ openssl zlib pcre libxml2 libxslt + perl ? null ]; in rec { @@ -17,6 +18,8 @@ rec { "--with-http_dav_module" "--with-http_gzip_static_module" "--with-http_secure_link_module" + # Install destination problems + # "--with-http_perl_module" ]; preConfigure = a.fullDepEntry '' diff --git a/pkgs/servers/http/nginx/src-for-default.nix b/pkgs/servers/http/nginx/src-for-default.nix index 34d36f463d2..02bf2efae9c 100644 --- a/pkgs/servers/http/nginx/src-for-default.nix +++ b/pkgs/servers/http/nginx/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.7.62"; - name="nginx-0.7.62"; - hash="0bcd6xi73xxgwz7x8skslg96cqfhy1zs8lkpxizki9s3gyghxvk0"; - url="http://sysoev.ru/nginx/nginx-0.7.62.tar.gz"; - advertisedUrl="http://sysoev.ru/nginx/nginx-0.7.62.tar.gz"; + version="0.7.65"; + name="nginx-0.7.65"; + hash="0fn35sm94p7s28hrih1qb2b634zdzkldsfhzk7gixc09bapwrw69"; + url="http://sysoev.ru/nginx/nginx-${version}.tar.gz"; + advertisedUrl="http://sysoev.ru/nginx/nginx-0.7.65.tar.gz"; } From ff8fbd8a1a753fd1de511c2b55fe5c6410381c2e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 9 Apr 2010 11:37:38 +0000 Subject: [PATCH 172/313] Fix remaining perl mention in buildInputs svn path=/nixpkgs/trunk/; revision=20989 --- pkgs/servers/http/nginx/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index d86f38e1863..4d1d39ba417 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -3,7 +3,6 @@ let s = import ./src-for-default.nix; buildInputs = with a; [ openssl zlib pcre libxml2 libxslt - perl ? null ]; in rec { From 61cb191a5ce0781d23a7de32aacd4833e4a0e6ec Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Apr 2010 12:41:48 +0000 Subject: [PATCH 173/313] * Bison 2.4.2. svn path=/nixpkgs/trunk/; revision=20991 --- pkgs/development/tools/parsing/bison/bison-2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/bison-2.4.nix b/pkgs/development/tools/parsing/bison/bison-2.4.nix index 5d65eacecd9..245bdad1f92 100644 --- a/pkgs/development/tools/parsing/bison/bison-2.4.nix +++ b/pkgs/development/tools/parsing/bison/bison-2.4.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, m4}: stdenv.mkDerivation rec { - name = "bison-2.4.1"; + name = "bison-2.4.2"; src = fetchurl { url = "mirror://gnu/bison/${name}.tar.bz2"; - sha256 = "0swf0qbxrcqwb5dw19fd47nj8m490m8kwz5f8k33d7hlhablcm13"; + sha256 = "1f2gmy9bhajrypyz25rqjbz5j024yikr2kaggjjsc15gm4x29ysp"; }; buildInputs = [m4]; From 2f423bbf1fac474fcee3832757234ea15e38a54d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Apr 2010 13:06:46 +0000 Subject: [PATCH 174/313] * Firefox 3.5.9. svn path=/nixpkgs/trunk/; revision=20992 --- pkgs/applications/networking/browsers/firefox/3.5.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/3.5.nix b/pkgs/applications/networking/browsers/firefox/3.5.nix index c11f3ab4709..e26d9a7456d 100644 --- a/pkgs/applications/networking/browsers/firefox/3.5.nix +++ b/pkgs/applications/networking/browsers/firefox/3.5.nix @@ -12,14 +12,14 @@ rec { - firefoxVersion = "3.5.8"; + firefoxVersion = "3.5.9"; - xulVersion = "1.9.1.8"; # this attribute is used by other packages + xulVersion = "1.9.1.9"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "4bfb9a274113fb9ee590c00da69d995dc500d4cc"; + sha1 = "f20f06a783ee81ec1d7d6f7a75b38a25dc58f0e1"; }; From 396b40f6d4b8d8712827e036145d50cf4189c44d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Apr 2010 13:37:41 +0000 Subject: [PATCH 175/313] * Updated nspr, nss. svn path=/nixpkgs/trunk/; revision=20993 --- pkgs/development/libraries/nspr/default.nix | 6 +++--- pkgs/development/libraries/nss/default.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 6ed8db7f10e..88dc9ffe696 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -let version = "4.8.3"; in +let version = "4.8.4"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "1n7vyjj8x8qaqf59slnxngn47gl5wpiq420bnsyc55hava1qgzxp"; + sha256 = "0ik73yimgfpj3lkqjnpf76b942j76i5yi1z8bn75dxxc08brl4cc"; }; preConfigure = "cd mozilla/nsprpub"; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 473405c5951..a51c355b644 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, nspr, perl, zlib}: +{ stdenv, fetchurl, nspr, perl, zlib }: let @@ -10,11 +10,11 @@ let in stdenv.mkDerivation { - name = "nss-3.12.5"; + name = "nss-3.12.6"; src = fetchurl { - url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_5_RTM/src/nss-3.12.5.tar.gz; - sha1 = "ec12c6eddba5fb4609a174b079095b374935d37c"; + url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/nss-3.12.6.tar.gz; + sha1 = "461e81adbdef6c3f848fcfee0dc5ad8c2dbebd46"; }; buildInputs = [nspr perl zlib]; From 6c37624153d57c8061befae00eb9c6e68f367997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 9 Apr 2010 15:40:12 +0000 Subject: [PATCH 176/313] Updating curlftpfs svn path=/nixpkgs/trunk/; revision=20994 --- pkgs/tools/filesystems/curlftpfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 6d90cae5dc5..90832fc50b1 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, fuse, curl, pkgconfig, glib, zlib}: stdenv.mkDerivation { - name = "curlftpfs-0.9.1"; + name = "curlftpfs-0.9.2"; src = fetchurl { - url = mirror://sourceforge/curlftpfs/curlftpfs-0.9.1.tar.gz; - sha256 = "9f50cdf02c0dc31ef148410345b2374d294d8853d2dae11775e36b0268ad227d"; + url = mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz; + sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f"; }; buildInputs = [fuse curl pkgconfig glib zlib]; } From 2f67d3cc664c4a4e8733a8071cdf45080d8e3b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 9 Apr 2010 15:40:18 +0000 Subject: [PATCH 177/313] Updating boost. Maybe we want a 'default.nix' reflecting the latest version, instead of changing and changing the version? svn path=/nixpkgs/trunk/; revision=20995 --- pkgs/development/libraries/boost/{1.41.0.nix => 1.42.0.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/boost/{1.41.0.nix => 1.42.0.nix} (90%) diff --git a/pkgs/development/libraries/boost/1.41.0.nix b/pkgs/development/libraries/boost/1.42.0.nix similarity index 90% rename from pkgs/development/libraries/boost/1.41.0.nix rename to pkgs/development/libraries/boost/1.42.0.nix index 1bd500e270a..4f71e7347a9 100644 --- a/pkgs/development/libraries/boost/1.41.0.nix +++ b/pkgs/development/libraries/boost/1.42.0.nix @@ -33,7 +33,7 @@ let in stdenv.mkDerivation { - name = "boost-1.41.0"; + name = "boost-1.42.0"; meta = { homepage = "http://boost.org/"; @@ -42,8 +42,8 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_41_0.tar.bz2"; - sha256 = "09n7bjac2nlp7c8khpml2mq4qm33w2dn4ksb50c37wga95klxy8y"; + url = "mirror://sourceforge/boost/boost_1_42_0.tar.bz2"; + sha256 = "02g6m6f7m11ig93p5sx7sfq75c15y9kn2pa3csn1bkjhs9dvj7jb"; }; buildInputs = [icu expat zlib bzip2 python]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f10e7a3a278..b7f73fd9387 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3383,7 +3383,7 @@ let inherit fetchurl stdenv icu expat zlib bzip2 python; }; - boost = makeOverridable (import ../development/libraries/boost/1.41.0.nix) { + boost = makeOverridable (import ../development/libraries/boost/1.42.0.nix) { inherit fetchurl stdenv icu expat zlib bzip2 python; }; From bc54fc96da840e33094545cdd1c88230445d4a07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 9 Apr 2010 16:04:11 +0000 Subject: [PATCH 178/313] Updating cmake. Big kde rebuild to come. svn path=/nixpkgs/trunk/; revision=20996 --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 4158c737612..d6cbcccc517 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,7 +1,7 @@ {fetchurl, stdenv, replace, ncurses}: stdenv.mkDerivation rec { - name = "cmake-2.8.0"; + name = "cmake-2.8.1"; # We look for cmake modules in .../share/cmake-${majorVersion}/Modules. majorVersion = "2.8"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.cmake.org/files/v${majorVersion}/${name}.tar.gz"; - sha256 = "0va7kxczqb920n61xnyhr99ajs4v05mssk4n0p6z55yvr9g62zc4"; + sha256 = "0hi28blqxvir0dkhln90sgr0m3ri9n2i3hlmwdl4m5vkfsmp9bky"; }; postUnpack = '' From 3fd062e933d9b1b34bd027ab0016eb24ee954a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 9 Apr 2010 18:43:56 +0000 Subject: [PATCH 179/313] Fixing kde44 qimageblitz. I remove the patch about FindQt4.cmake; let's trust its version better. svn path=/nixpkgs/trunk/; revision=20997 --- pkgs/desktops/kde-4.4/support/qimageblitz/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix b/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix index b03301e76e8..34cbe36b5da 100644 --- a/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix +++ b/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix @@ -6,9 +6,6 @@ stdenv.mkDerivation { url = mirror://sourceforge/qimageblitz/qimageblitz-0.0.4.tar.bz2; md5 = "cb87c7f1c0455e8984ee4830f1e749cf"; }; - patchPhase = '' - cp ${cmake}/share/cmake-${cmake.majorVersion}/Modules/FindQt4.cmake cmake/modules - ''; buildInputs = [ cmake qt4 ]; meta = { description = "Graphical effect and filter library for KDE4"; From a2334e604bcd9b43a2f9723d1379cf8d78eeae29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 10 Apr 2010 10:47:30 +0000 Subject: [PATCH 180/313] Adding slimrat (not the gui, but at least the cli) svn path=/nixpkgs/trunk/; revision=20999 --- pkgs/tools/networking/slimrat/default.nix | 31 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/networking/slimrat/default.nix diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix new file mode 100644 index 00000000000..38b7c27b6fd --- /dev/null +++ b/pkgs/tools/networking/slimrat/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, perl, WWWMechanize, LWP, makeWrapper}: + +stdenv.mkDerivation { + name = "slimrat-1.0"; + src = fetchurl { + url = http://slimrat.googlecode.com/files/slimrat-1.0.tar.bz2; + sha256 = "139b71d45k4b1y47iq62a9732cnaqqbh8s4knkrgq2hx0jxpsk5a"; + }; + + buildInputs = [ perl WWWMechanize LWP makeWrapper ]; + + patchPhase = '' + sed -e 's,#!.*,#!${perl}/bin/perl,' -i src/{slimrat,slimrat-gui} + ''; + + installPhase = '' + ensureDir $out/share/slimrat $out/bin + cp -R src/* $out/share/slimrat + # slimrat-gui does not work (it needs the Gtk2 perl package) + for i in slimrat; do + makeWrapper $out/share/slimrat/$i $out/bin/$i \ + --prefix PERL5LIB : $PERL5LIB + done + ''; + + meta = { + homepage = http://code.google.com/p/slimrat/; + description = "Linux Rapidshare downloader"; + license = "BSD"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7f73fd9387..c91cff08edc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1542,6 +1542,11 @@ let inherit stdenv perl; }; + slimrat = import ../tools/networking/slimrat { + inherit fetchurl stdenv perl makeWrapper; + inherit (perlPackages) WWWMechanize LWP; + }; + slsnif = import ../tools/misc/slsnif { inherit fetchurl stdenv; }; From 86a0b21de87b116f94e63572916c9d5f5385bf85 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sat, 10 Apr 2010 19:06:59 +0000 Subject: [PATCH 181/313] update to 2.8.3 svn path=/nixpkgs/trunk/; revision=21000 --- pkgs/applications/office/abiword/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index fceb5a04e6e..9c5a0506287 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -3,10 +3,10 @@ enchant, wv, librsvg, bzip2 }: stdenv.mkDerivation { - name = "abiword-2.8.2"; + name = "abiword-2.8.3"; src = fetchurl { - url = http://www.abisource.org/downloads/abiword/2.8.2/source/abiword-2.8.2.tar.gz; - sha256 = "176v0c41453qspz958s9jlsbh1sdg61j7cpdp86x93lsci3qyrnb"; + url = http://www.abisource.org/downloads/abiword/2.8.3/source/abiword-2.8.3.tar.gz; + sha256 = "1jz3w1rp5wyhv2sk62r14kxljcd3x9kf4axm3zfjaqifhnjpnkxp"; }; buildInputs = [pkgconfig gtk libglade librsvg bzip2 From 9cef0c7941dbb7f6cb1dd546fd93bd1b185958e8 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 10 Apr 2010 20:26:41 +0000 Subject: [PATCH 182/313] Update linuxwacom, add 0.8.4.x svn path=/nixpkgs/trunk/; revision=21001 --- pkgs/misc/linuxwacom/0.8.4.x.nix | 5 +++++ pkgs/misc/linuxwacom/0.8.5.x.nix | 5 +++++ pkgs/misc/linuxwacom/src-for-default.nix | 9 --------- pkgs/misc/linuxwacom/src-info-for-default.nix | 7 ------- pkgs/misc/linuxwacom/{default.nix => wacom.nix} | 14 ++++++-------- pkgs/top-level/all-packages.nix | 9 ++++++++- 6 files changed, 24 insertions(+), 25 deletions(-) create mode 100644 pkgs/misc/linuxwacom/0.8.4.x.nix create mode 100644 pkgs/misc/linuxwacom/0.8.5.x.nix delete mode 100644 pkgs/misc/linuxwacom/src-for-default.nix delete mode 100644 pkgs/misc/linuxwacom/src-info-for-default.nix rename pkgs/misc/linuxwacom/{default.nix => wacom.nix} (68%) diff --git a/pkgs/misc/linuxwacom/0.8.4.x.nix b/pkgs/misc/linuxwacom/0.8.4.x.nix new file mode 100644 index 00000000000..a8bd129664e --- /dev/null +++ b/pkgs/misc/linuxwacom/0.8.4.x.nix @@ -0,0 +1,5 @@ +args: (import ./wacom.nix) (args // +{ + version = "0.8.4-4"; + hash = "1cydd8906y923llxf9s1fvzb26dbcfvzlgasmlqpa75p98fnnrpz"; +}) diff --git a/pkgs/misc/linuxwacom/0.8.5.x.nix b/pkgs/misc/linuxwacom/0.8.5.x.nix new file mode 100644 index 00000000000..89114bbc75d --- /dev/null +++ b/pkgs/misc/linuxwacom/0.8.5.x.nix @@ -0,0 +1,5 @@ +args: (import ./wacom.nix) (args // +{ + version = "0.8.5-12"; + hash = "0i4dx3gh7f56id5ca60l9s3ypxnwn6gg4w9a6jzkbgzbipknn71k"; +}) diff --git a/pkgs/misc/linuxwacom/src-for-default.nix b/pkgs/misc/linuxwacom/src-for-default.nix deleted file mode 100644 index df4a93809c1..00000000000 --- a/pkgs/misc/linuxwacom/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="0.8.5-1"; - name="linuxwacom-0.8.5-1"; - hash="0a4j9fdvi207s11h4xnx3yfnf8lqijwn6w5blwpaq8spd94xywrs"; - url="http://downloads.sourceforge.net/linuxwacom/files/linuxwacom-dev/${version}/linuxwacom-${version}.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/linuxwacom/files/linuxwacom-dev/0.8.5-1/linuxwacom-0.8.5-1.tar.bz2"; - - -} diff --git a/pkgs/misc/linuxwacom/src-info-for-default.nix b/pkgs/misc/linuxwacom/src-info-for-default.nix deleted file mode 100644 index 97c59501deb..00000000000 --- a/pkgs/misc/linuxwacom/src-info-for-default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - downloadPage = "http://sourceforge.net/projects/linuxwacom/files/"; - baseName = "linuxwacom"; - choiceCommand = ''head -1 | sed -re "$skipRedirectSF"''; - versionExtractorSedScript = "\$extractReleaseSF"; - versionReferenceCreator = "\$(replaceAllVersionOccurences)"; -} diff --git a/pkgs/misc/linuxwacom/default.nix b/pkgs/misc/linuxwacom/wacom.nix similarity index 68% rename from pkgs/misc/linuxwacom/default.nix rename to pkgs/misc/linuxwacom/wacom.nix index 9e1e7186db7..9493bc832bc 100644 --- a/pkgs/misc/linuxwacom/default.nix +++ b/pkgs/misc/linuxwacom/wacom.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, libX11, libXi, inputproto -, xproto, ncurses, pkgconfig, xorgserver }: - -let s = import ./src-for-default.nix; in +, xproto, ncurses, pkgconfig, xorgserver, version, hash }: stdenv.mkDerivation rec { - inherit (s) name; + name = "linuxwacom-${version}"; src = fetchurl { - url = s.url; - sha256 = s.hash; + url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; + sha256 = hash; }; buildInputs = [ libX11 libXi inputproto xproto ncurses pkgconfig xorgserver ]; @@ -27,8 +25,8 @@ stdenv.mkDerivation rec { ''; meta = { - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = with stdenv.lib.maintainers; [raskin urkud]; description = "Wacom digitizer driver for X11"; - homepage = http://linuxwacom.sf.net; + homepage = http://linuxwacom.sourceforge.net; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c91cff08edc..82f37490761 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9119,7 +9119,14 @@ let flex = flex2535; }; - linuxwacom = import ../misc/linuxwacom { + linuxwacom = linuxwacom_0_8_5; + + linuxwacom_0_8_5 = import ../misc/linuxwacom/0.8.5.x.nix { + inherit fetchurl stdenv ncurses pkgconfig; + inherit (xorg) libX11 libXi xproto inputproto xorgserver; + }; + + linuxwacom_0_8_4 = import ../misc/linuxwacom/0.8.4.x.nix { inherit fetchurl stdenv ncurses pkgconfig; inherit (xorg) libX11 libXi xproto inputproto xorgserver; }; From 22bc695075c8b3bc47d42548a81e58b466b4dc3d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 10 Apr 2010 20:26:54 +0000 Subject: [PATCH 183/313] Use package overrides instead of getConfig svn path=/nixpkgs/trunk/; revision=21002 --- pkgs/applications/misc/djvulibre/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index e40accf8b44..0b052b094e2 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, config, libjpeg, libtiff, libpng, ghostscript +{ stdenv, fetchurl, lib, useQt3 ? true, libjpeg, libtiff, libpng, ghostscript , libungif, zlib, x11, libX11, mesa, qt3 }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ] ++ - (if config "qt3" true then [qt3 libX11 x11 mesa] else []); + stdenv.lib.optionals useQt3 [qt3 libX11 x11 mesa]; meta = { description = "A library and viewer for the DJVU file format for scanned images"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82f37490761..d11427e4078 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7045,10 +7045,9 @@ let inherit (gtkLibs) gtk glib; }; - djvulibre = import ../applications/misc/djvulibre { + djvulibre = makeOverridable (import ../applications/misc/djvulibre) { inherit stdenv fetchurl lib libjpeg libtiff libungif qt3 zlib ghostscript libpng mesa x11; - config = getPkgConfig "djvulibre"; inherit (xlibs) libX11; }; From eb20e3b926a8df29255edfac467ade153b81c600 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 10 Apr 2010 20:27:02 +0000 Subject: [PATCH 184/313] Add gpm support to elinks svn path=/nixpkgs/trunk/; revision=21003 --- pkgs/applications/networking/browsers/elinks/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 1e786848133..9015da07d41 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "c10e657fbd884eae4f01b91b32407bbfcbcae0ad5017fb24ea365aebc71d2af1"; }; - buildInputs = [python perl ncurses x11 bzip2 zlib openssl spidermonkey guile]; + buildInputs = [python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm]; configureFlags = "--enable-finger --enable-html-highlight --with-guile --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent --enable-nntp --with-openssl=${openssl}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d11427e4078..f53da7f1062 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7096,7 +7096,7 @@ let elinks = import ../applications/networking/browsers/elinks { inherit stdenv fetchurl python perl ncurses x11 zlib openssl spidermonkey - guile bzip2; + guile bzip2 gpm; }; elvis = import ../applications/editors/elvis { From 31d047a83f833e21c056647038f165a181c91235 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 10 Apr 2010 20:27:09 +0000 Subject: [PATCH 185/313] Remove tabs svn path=/nixpkgs/trunk/; revision=21004 --- pkgs/build-support/buildenv/builder.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 2da4311b388..37eb21887fd 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -55,14 +55,14 @@ sub createLinks { my $relName2 = "$relName/$baseName"; # Urgh, hacky... - if ($srcFile =~ /\/propagated-build-inputs$/ || + if ($srcFile =~ /\/propagated-build-inputs$/ || $srcFile =~ /\/nix-support$/ || $srcFile =~ /\/perllocal.pod$/ || $srcFile =~ /\/info\/dir$/ || $srcFile =~ /\/log$/) { # Do nothing. - } + } elsif (-d $srcFile) { From 46888c922c4009e4ded43539f31a30beec96a11c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 10 Apr 2010 20:27:17 +0000 Subject: [PATCH 186/313] cyrus-sasl: ${out} escaping sasl looked for plugins in '${out}/lib/sasl2', not /nix/store/.../lib/sasl2 svn path=/nixpkgs/trunk/; revision=21005 --- pkgs/development/libraries/cyrus-sasl/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index c9b87ebb7d2..3552ad32346 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,5 +1,5 @@ -args: -with args; +{ stdenv, fetchurl, openssl, db4, gettext} : + stdenv.mkDerivation { name = "cyrus-sasl-2.1.23"; @@ -7,7 +7,9 @@ stdenv.mkDerivation { url = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.23.tar.gz; sha256 = "0dmi41hfy015pzks8n93qsshgvi0az7pv81nls4nxayb810crvr0"; }; - configureFlags="--with-openssl=${openssl} --with-plugindir=\${out}/lib/sasl2 --with-configdir=\${out}/lib/sasl2"; + preConfigure='' + configureFlags="--with-openssl=${openssl} --with-plugindir=$out/lib/sasl2 --with-configdir=$out/lib/sasl2" + ''; buildInputs = [ openssl db4 gettext ]; patches = [ ./cyrus-sasl-2.1.22-bad-elif.patch ]; } From d4e934b3d21dd6f8993d6c2886f19add7129a47b Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sat, 10 Apr 2010 21:06:23 +0000 Subject: [PATCH 187/313] update to 1.1.0 svn path=/nixpkgs/trunk/; revision=21006 --- pkgs/games/scummvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 3a2aaee58a2..f26d25d0cbc 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, SDL, zlib, mpeg2dec}: stdenv.mkDerivation { - name = "scummvm-1.0.0"; + name = "scummvm-1.1.0"; src = fetchurl { - url = mirror://sourceforge/scummvm/scummvm-1.0.0.tar.bz2; - sha256 = "1v00ikxn9j7vid0jrf7hh7wvk8scv69isif26ngh3jngs2wk42cj"; + url = mirror://sourceforge/scummvm/scummvm-1.1.0.tar.bz2; + sha256 = "0fdqc98jib6593cpjc1jhklp9y0c1mlk0lrn9d6r9ax159x53h2k"; }; buildInputs = [SDL zlib mpeg2dec]; From 5bd8e9c0595af1986d1bb0025fb06b6be7d6cd9d Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sat, 10 Apr 2010 22:33:44 +0000 Subject: [PATCH 188/313] update to 1.3.3.14, disable cairo for now, since it doesn't compile (also not with 1.3.3.13 svn path=/nixpkgs/trunk/; revision=21007 --- pkgs/applications/office/scribus/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index cf8e60b38aa..93f8fd79fb1 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -8,17 +8,18 @@ assert stdenv.gcc.gcc != null; # will be released with the next version of scribus - So don't miss them # when upgrading this package -let useCairo = true; +#let useCairo = true; +let useCairo = false; in stdenv.mkDerivation { - name = "scribus-1.3.3.13"; + name = "scribus-1.3.3.14"; src = fetchurl { - url = mirror://sourceforge/scribus/scribus/1.3.3.13/scribus-1.3.3.13.tar.bz2; - sha256 = "06l4ndfsw7ss7mdr6a6km9fbr9p2m3b5idm3n8lpgwk2ss0mw9as"; + url = mirror://sourceforge/scribus/scribus/1.3.3.14/scribus-1.3.3.14.tar.bz2; + sha256 = "1ig7x6vxhqgjlpnv6hkzpb6gj4yvxsrx7rw900zlp7g6zxl01iyy"; }; cmakeFlags = if useCairo then "-DWANT_CAIRO=1" else ""; From e0f50ecb399984b85ca5360d8c0f6ce82d950fcc Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 11 Apr 2010 12:13:23 +0000 Subject: [PATCH 189/313] update to 2.2.3 svn path=/nixpkgs/trunk/; revision=21008 --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index ca1966d7b86..62d5347d0ea 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,13 +1,13 @@ args: with args; stdenv.mkDerivation (rec { pname = "nano"; - version = "2.2.1"; + version = "2.2.3"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.gz"; - sha256 = "1xqldl7ipsmz5x8q3fw9s6yshxfp39kly96kb15l1kawng1wfcfq"; + sha256 = "1vpl993xrpj8bqi1ayga8fc0j2jag90xp6rqakzwm3bxw71hmwi2"; }; buildInputs = [ncurses gettext]; # configureFlags = "--enable-tiny"; From f3ec0abdae908d65974ef547e07c624c59558d6f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Apr 2010 14:49:36 +0000 Subject: [PATCH 190/313] Upgrade to gdb-7.1 svn path=/nixpkgs/trunk/; revision=21010 --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 22dd8a6736d..f44411e77d7 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -2,7 +2,7 @@ , target ? null }: let - basename = "gdb-7.0.1"; + basename = "gdb-7.1"; in stdenv.mkDerivation rec { name = basename + stdenv.lib.optionalString (target != null) @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.bz2"; - sha256 = "06rw3qqilq5dpc0y8d9vny6vizl20bvlbl0vwx4nbpis0p83y32n"; + sha256 = "0ljkv3xkpqg4x38mrmzx4b7h1bkpfy41vmi5q8nnakhajzbjfb0l"; }; # TODO: Add optional support for Python scripting. From f25c68f01a53f31f5add0fce4dfaad51d6ed7cb0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Apr 2010 15:50:41 +0000 Subject: [PATCH 191/313] Remove old kde packages svn path=/nixpkgs/trunk/; revision=21011 --- .../applications/graphics/digikam/default.nix | 25 -- .../graphics/gwenview/default.nix | 23 -- .../networking/irc/konversation/default.nix | 18 - .../kde-4.3/accessibility/default.nix | 17 - pkgs/desktops/kde-4.3/admin/builder.sh | 13 - pkgs/desktops/kde-4.3/admin/default.nix | 29 -- pkgs/desktops/kde-4.3/artwork/default.nix | 20 - .../desktops/kde-4.3/base-runtime/default.nix | 21 - .../kde-4.3/base-workspace/builder.sh | 11 - .../kde-4.3/base-workspace/default.nix | 26 -- pkgs/desktops/kde-4.3/base/default.nix | 21 - pkgs/desktops/kde-4.3/bindings/builder.sh | 11 - pkgs/desktops/kde-4.3/bindings/default.nix | 24 -- pkgs/desktops/kde-4.3/default.nix | 295 -------------- pkgs/desktops/kde-4.3/edu/default.nix | 20 - .../kde-4.3/extragear/amarok/builder.sh | 9 - .../kde-4.3/extragear/amarok/default.nix | 22 - .../kde-4.3/extragear/digikam/default.nix | 23 -- .../kde-4.3/extragear/filelight/default.nix | 19 - .../extragear/gtk-qt-engine/builder.sh | 11 - .../extragear/gtk-qt-engine/default.nix | 11 - .../kde-4.3/extragear/kdesvn/builder.sh | 8 - .../kde-4.3/extragear/kdesvn/default.nix | 20 - .../extragear/kipi-plugins/default.nix | 23 -- .../kde-4.3/extragear/kmplayer/builder.sh | 9 - .../kde-4.3/extragear/kmplayer/default.nix | 18 - .../kde-4.3/extragear/koffice/default.nix | 21 - .../extragear/konversation/default.nix | 22 - .../kde-4.3/extragear/krusader/default.nix | 18 - .../extragear/krusader/krusader-gcc44.patch | 10 - .../kde-4.3/extragear/ktorrent/default.nix | 20 - pkgs/desktops/kde-4.3/games/default.nix | 17 - pkgs/desktops/kde-4.3/graphics/default.nix | 24 -- pkgs/desktops/kde-4.3/l10n/default.nix | 379 ------------------ .../l10n/generate-expr-from-tarballs.pl | 102 ----- .../kde-4.3/libs-experimental/builder.sh | 8 - .../kde-4.3/libs-experimental/default.nix | 18 - pkgs/desktops/kde-4.3/libs/default.nix | 32 -- pkgs/desktops/kde-4.3/multimedia/default.nix | 22 - pkgs/desktops/kde-4.3/network/default.nix | 24 -- .../desktops/kde-4.3/oxygen-icons/default.nix | 16 - pkgs/desktops/kde-4.3/pim-runtime/builder.sh | 8 - pkgs/desktops/kde-4.3/pim-runtime/default.nix | 22 - pkgs/desktops/kde-4.3/pim/builder.sh | 8 - pkgs/desktops/kde-4.3/pim/default.nix | 25 -- pkgs/desktops/kde-4.3/pimlibs/default.nix | 19 - .../desktops/kde-4.3/plasma-addons/builder.sh | 9 - .../kde-4.3/plasma-addons/default.nix | 24 -- pkgs/desktops/kde-4.3/sdk/builder.sh | 8 - pkgs/desktops/kde-4.3/sdk/default.nix | 22 - .../kde-4.3/support/akonadi/default.nix | 17 - .../kde-4.3/support/automoc4/default.nix | 15 - .../kde-4.3/support/decibel/default.nix | 16 - .../kde-4.3/support/eigen/default.nix | 16 - .../kde-4.3/support/phonon/default.nix | 20 - .../kde-4.3/support/polkit-qt/default.nix | 16 - .../desktops/kde-4.3/support/qca2/default.nix | 16 - .../kde-4.3/support/qimageblitz/default.nix | 17 - .../kde-4.3/support/soprano/default.nix | 20 - .../kde-4.3/support/strigi/default.nix | 28 -- pkgs/desktops/kde-4.3/toys/default.nix | 17 - pkgs/desktops/kde-4.3/updatekde.sh | 65 --- pkgs/desktops/kde-4.3/utils/builder.sh | 13 - pkgs/desktops/kde-4.3/utils/default.nix | 29 -- pkgs/desktops/kde-4.3/webdev/default.nix | 18 - pkgs/desktops/superkaramba/builder.sh | 15 - pkgs/desktops/superkaramba/default.nix | 50 --- pkgs/tools/system/filelight/default.nix | 23 -- pkgs/top-level/all-packages.nix | 45 +-- pkgs/top-level/release.nix | 38 -- 70 files changed, 1 insertion(+), 2118 deletions(-) delete mode 100644 pkgs/applications/graphics/digikam/default.nix delete mode 100644 pkgs/applications/graphics/gwenview/default.nix delete mode 100644 pkgs/applications/networking/irc/konversation/default.nix delete mode 100644 pkgs/desktops/kde-4.3/accessibility/default.nix delete mode 100644 pkgs/desktops/kde-4.3/admin/builder.sh delete mode 100644 pkgs/desktops/kde-4.3/admin/default.nix delete mode 100644 pkgs/desktops/kde-4.3/artwork/default.nix delete mode 100644 pkgs/desktops/kde-4.3/base-runtime/default.nix delete mode 100644 pkgs/desktops/kde-4.3/base-workspace/builder.sh delete mode 100644 pkgs/desktops/kde-4.3/base-workspace/default.nix delete mode 100644 pkgs/desktops/kde-4.3/base/default.nix delete mode 100644 pkgs/desktops/kde-4.3/bindings/builder.sh delete mode 100644 pkgs/desktops/kde-4.3/bindings/default.nix delete mode 100644 pkgs/desktops/kde-4.3/default.nix delete mode 100644 pkgs/desktops/kde-4.3/edu/default.nix delete mode 100644 pkgs/desktops/kde-4.3/extragear/amarok/builder.sh delete mode 100644 pkgs/desktops/kde-4.3/extragear/amarok/default.nix delete mode 100644 pkgs/desktops/kde-4.3/extragear/digikam/default.nix delete mode 100644 pkgs/desktops/kde-4.3/extragear/filelight/default.nix delete mode 100644 pkgs/desktops/kde-4.3/extragear/gtk-qt-engine/builder.sh delete mode 100644 pkgs/desktops/kde-4.3/extragear/gtk-qt-engine/default.nix delete mode 100644 pkgs/desktops/kde-4.3/extragear/kdesvn/builder.sh delete mode 100644 pkgs/desktops/kde-4.3/extragear/kdesvn/default.nix delete mode 100644 pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix delete mode 100644 pkgs/desktops/kde-4.3/extragear/kmplayer/builder.sh delete mode 100644 pkgs/desktops/kde-4.3/extragear/kmplayer/default.nix delete mode 100644 pkgs/desktops/kde-4.3/extragear/koffice/default.nix delete mode 100644 pkgs/desktops/kde-4.3/extragear/konversation/default.nix delete mode 100644 pkgs/desktops/kde-4.3/extragear/krusader/default.nix delete mode 100644 pkgs/desktops/kde-4.3/extragear/krusader/krusader-gcc44.patch delete mode 100644 pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix delete mode 100644 pkgs/desktops/kde-4.3/games/default.nix delete mode 100644 pkgs/desktops/kde-4.3/graphics/default.nix delete mode 100644 pkgs/desktops/kde-4.3/l10n/default.nix delete mode 100755 pkgs/desktops/kde-4.3/l10n/generate-expr-from-tarballs.pl delete mode 100644 pkgs/desktops/kde-4.3/libs-experimental/builder.sh delete mode 100644 pkgs/desktops/kde-4.3/libs-experimental/default.nix delete mode 100644 pkgs/desktops/kde-4.3/libs/default.nix delete mode 100644 pkgs/desktops/kde-4.3/multimedia/default.nix delete mode 100644 pkgs/desktops/kde-4.3/network/default.nix delete mode 100644 pkgs/desktops/kde-4.3/oxygen-icons/default.nix delete mode 100644 pkgs/desktops/kde-4.3/pim-runtime/builder.sh delete mode 100644 pkgs/desktops/kde-4.3/pim-runtime/default.nix delete mode 100644 pkgs/desktops/kde-4.3/pim/builder.sh delete mode 100644 pkgs/desktops/kde-4.3/pim/default.nix delete mode 100644 pkgs/desktops/kde-4.3/pimlibs/default.nix delete mode 100644 pkgs/desktops/kde-4.3/plasma-addons/builder.sh delete mode 100644 pkgs/desktops/kde-4.3/plasma-addons/default.nix delete mode 100644 pkgs/desktops/kde-4.3/sdk/builder.sh delete mode 100644 pkgs/desktops/kde-4.3/sdk/default.nix delete mode 100644 pkgs/desktops/kde-4.3/support/akonadi/default.nix delete mode 100644 pkgs/desktops/kde-4.3/support/automoc4/default.nix delete mode 100644 pkgs/desktops/kde-4.3/support/decibel/default.nix delete mode 100644 pkgs/desktops/kde-4.3/support/eigen/default.nix delete mode 100644 pkgs/desktops/kde-4.3/support/phonon/default.nix delete mode 100644 pkgs/desktops/kde-4.3/support/polkit-qt/default.nix delete mode 100644 pkgs/desktops/kde-4.3/support/qca2/default.nix delete mode 100644 pkgs/desktops/kde-4.3/support/qimageblitz/default.nix delete mode 100644 pkgs/desktops/kde-4.3/support/soprano/default.nix delete mode 100644 pkgs/desktops/kde-4.3/support/strigi/default.nix delete mode 100644 pkgs/desktops/kde-4.3/toys/default.nix delete mode 100755 pkgs/desktops/kde-4.3/updatekde.sh delete mode 100644 pkgs/desktops/kde-4.3/utils/builder.sh delete mode 100644 pkgs/desktops/kde-4.3/utils/default.nix delete mode 100644 pkgs/desktops/kde-4.3/webdev/default.nix delete mode 100755 pkgs/desktops/superkaramba/builder.sh delete mode 100644 pkgs/desktops/superkaramba/default.nix delete mode 100644 pkgs/tools/system/filelight/default.nix diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix deleted file mode 100644 index 907c5ca3e22..00000000000 --- a/pkgs/applications/graphics/digikam/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, fetchurl, kdelibs, exiv2, libXt, libXext, zlib, libjpeg, perl, qt3, - libpng, expat, cmake }: - -stdenv.mkDerivation { - name = "digikam-1.0.0"; - - src = fetchurl { - url = mirror://sourceforge/digikam/digikam-1.0.0.tar.bz2; - sha256 = "0qblqyjn0vas8hyqn5s9rr401d93cagk53y3j8kch0mr0bk706bk"; - }; - -/* - configurePhase = '' - LDFLAGS="$LDFLAGS -ljpeg" ./configure --without-arts --prefix=$out - ''; -*/ - - buildInputs = [ kdelibs exiv2 libXt libXext zlib libjpeg perl qt3 libpng expat cmake ]; - - meta = { - homepage = http://digikam.sourceforge.net/; - description = "KDE 3.x photo viewer"; - # license = "GPLv2+"; - }; -} diff --git a/pkgs/applications/graphics/gwenview/default.nix b/pkgs/applications/graphics/gwenview/default.nix deleted file mode 100644 index d7545ece55c..00000000000 --- a/pkgs/applications/graphics/gwenview/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, fetchurl, kdelibs, exiv2, libXt, libXext, zlib, libjpeg, perl, qt3, - libpng, expat }: - -stdenv.mkDerivation { - name = "gwenview-1.4.2"; - - src = fetchurl { - url = mirror://sourceforge/gwenview/gwenview-1.4.2.tar.bz2; - sha256 = "26ec1a3f3ac7cce9584b44e6090402776fb84df3fc5f9e5aadbe66e9887851fd"; - }; - - configurePhase = '' - LDFLAGS="$LDFLAGS -ljpeg" ./configure --without-arts --prefix=$out - ''; - - buildInputs = [ kdelibs exiv2 libXt libXext zlib libjpeg perl qt3 libpng expat ]; - - meta = { - homepage = http://gwenview.sourceforge.net/; - description = "KDE photo viewer"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix deleted file mode 100644 index 3467042c837..00000000000 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, libX11, libXt, libXext, libXrender, libXft, - arts, qt, kdelibs, zlib, libpng, libjpeg, perl, expat}: - -stdenv.mkDerivation { - name = "konversation-1.1"; - src = fetchurl { - url = http://download.berlios.de/konversation/konversation-1.1.tar.bz2; - sha256 = "3ef15e7a46c10a11aa369ff80dd33b3e2feb54834dfc036d3609c1ed94476d33"; - }; - buildInputs = [ arts qt kdelibs libX11 libXt libXext libXrender libXft - zlib libpng libjpeg perl expat ]; - - meta = { - description = "An IRC client for KDE"; - homepage = http://konversation.kde.org/; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.3/accessibility/default.nix b/pkgs/desktops/kde-4.3/accessibility/default.nix deleted file mode 100644 index dfa71fec107..00000000000 --- a/pkgs/desktops/kde-4.3/accessibility/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, lib, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "kdeaccessibility-4.3.5"; - src = fetchurl { - url = mirror://kde/stable/4.3.5/src/kdeaccessibility-4.3.5.tar.bz2; - sha256 = "00h89gnxsl1d01ib4rvszmm8vgbhg6q14bvd5gl3ibssyav5xgwn"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 phonon ]; - meta = { - description = "KDE accessibility tools"; - license = "GPL"; - homepage = http://www.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/admin/builder.sh b/pkgs/desktops/kde-4.3/admin/builder.sh deleted file mode 100644 index 09cb930f049..00000000000 --- a/pkgs/desktops/kde-4.3/admin/builder.sh +++ /dev/null @@ -1,13 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py - do - sed -i -e "s|/usr/share/system-config-printer|$system_config_printer/share/system-config-printer|" $i - done - - sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.3/admin/default.nix b/pkgs/desktops/kde-4.3/admin/default.nix deleted file mode 100644 index ba3d5b64c19..00000000000 --- a/pkgs/desktops/kde-4.3/admin/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, pkgconfig, perl, python -, sip, pyqt4, pycups, system_config_printer -, kdelibs, kdepimlibs, kdebindings, automoc4, phonon}: - -stdenv.mkDerivation { - name = "kdeadmin-4.3.5"; - - src = fetchurl { - url = mirror://kde/stable/4.3.5/src/kdeadmin-4.3.5.tar.bz2; - sha256 = "131w41rpxzg96pv0bdxjzvm0jhsziric3gd3fq26by4b8i662r9l"; - }; - - builder = ./builder.sh; - - inherit system_config_printer; - - includeAllQtDirs=true; - - - buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer - kdelibs kdepimlibs kdebindings automoc4 phonon ]; - - meta = { - description = "KDE Administration Utilities"; - license = "GPL"; - homepage = http://www.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/artwork/default.nix b/pkgs/desktops/kde-4.3/artwork/default.nix deleted file mode 100644 index 8a19578e9c4..00000000000 --- a/pkgs/desktops/kde-4.3/artwork/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, xscreensaver -, kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}: - -stdenv.mkDerivation { - name = "kdeartwork-4.3.5"; - src = fetchurl { - url = mirror://kde/stable/4.3.5/src/kdeartwork-4.3.5.tar.bz2; - sha256 = "07s1s5rdy5nmfll6dvnrpv3byx7zvflsqzffhlm7fsx7hy1m4cbq"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl xscreensaver - kdelibs kdebase_workspace automoc4 phonon strigi eigen ]; - meta = { - description = "KDE artwork"; - longDescription = "Contains various artwork for KDE such as backgrounds, icons and screensavers"; - license = "LGPL"; - homepage = http://www.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/base-runtime/default.nix b/pkgs/desktops/kde-4.3/base-runtime/default.nix deleted file mode 100644 index 1acb94c20b9..00000000000 --- a/pkgs/desktops/kde-4.3/base-runtime/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba, shared_mime_info -, kdelibs, automoc4, phonon, strigi, soprano, cluceneCore}: - -stdenv.mkDerivation { - name = "kdebase-runtime-4.3.5"; - src = fetchurl { - url = mirror://kde/stable/4.3.5/src/kdebase-runtime-4.3.5.tar.bz2; - sha256 = "0d73ryfw7pi69mzxaj8jgb3pxgc6ibz79bkr9b5dgg9n1zvadylx"; - }; -/* CLUCENE_HOME=cluceneCore;*/ - includeAllQtDirs=true; - buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba stdenv.gcc.libc shared_mime_info - kdelibs automoc4 phonon strigi soprano cluceneCore ]; - meta = { - description = "KDE runtime"; - longDescription = "Libraries and tools which supports running KDE desktop applications"; - license = "LGPL"; - homepage = http://www.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/base-workspace/builder.sh b/pkgs/desktops/kde-4.3/base-workspace/builder.sh deleted file mode 100644 index 97aba633c56..00000000000 --- a/pkgs/desktops/kde-4.3/base-workspace/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - for i in plasma/applets/systemtray/CMakeLists.txt plasma/applets/systemtray/notificationitemwatcher/CMakeLists.txt - do - sed -i -e "s|\${KDE4_DBUS_INTERFACES_DIR}|$kdelibs_experimental/share/dbus-1|" $i - done -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.3/base-workspace/default.nix b/pkgs/desktops/kde-4.3/base-workspace/default.nix deleted file mode 100644 index 16b18fb5176..00000000000 --- a/pkgs/desktops/kde-4.3/base-workspace/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, perl, python, pam, ConsoleKit -, qt4, sip, pyqt4, kdelibs, kdelibs_experimental, kdepimlibs, kdebindings -, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver -, lm_sensors, libxklavier, libusb, libpthreadstubs, boost -, automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt -}: - -stdenv.mkDerivation { - name = "kdebase-workspace-4.3.5"; - src = fetchurl { - url = mirror://kde/stable/4.3.5/src/kdebase-workspace-4.3.5.tar.bz2; - sha256 = "16qlrsbb3bxjdyz9by3v051g8v8r4w8z8gk1ssy8jy7qs57671br"; - }; - includeAllQtDirs=true; - inherit kdelibs_experimental; - builder = ./builder.sh; - buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdelibs_experimental kdepimlibs /*kdebindings*/ libpthreadstubs boost libusb stdenv.gcc.libc - libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver - lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt ]; - meta = { - description = "KDE Workspace"; - longDescription = "KDE base components that are only required to work with X11 such KDM and KWin"; - license = "GPL"; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/base/default.nix b/pkgs/desktops/kde-4.3/base/default.nix deleted file mode 100644 index f08e0b79c14..00000000000 --- a/pkgs/desktops/kde-4.3/base/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, perl, qt4, kdelibs, pciutils, libraw1394 -, kdebase_workspace -, automoc4, phonon, strigi, qimageblitz, soprano}: - -stdenv.mkDerivation { - name = "kdebase-4.3.5"; - src = fetchurl { - url = mirror://kde/stable/4.3.5/src/kdebase-4.3.5.tar.bz2; - sha256 = "04qm3gfz51iwwl8819fzyyjwyf6lk9nim13cp2l5abnfza0lhb9g"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394 - kdebase_workspace automoc4 phonon strigi qimageblitz soprano ]; - meta = { - description = "KDE Base components"; - longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole"; - license = "GPL"; - homepage = http://www.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/bindings/builder.sh b/pkgs/desktops/kde-4.3/bindings/builder.sh deleted file mode 100644 index e3f1df28b77..00000000000 --- a/pkgs/desktops/kde-4.3/bindings/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -tar xfvj $src -cd kdebindings-*/python/pykde4 -python configure.py -d $out/lib/python2.5/site-packages -v $out/share/sip -for i in `find . -name Makefile` -do - sed -i -e "s/-O2/-O0/" $i -done -make -make install diff --git a/pkgs/desktops/kde-4.3/bindings/default.nix b/pkgs/desktops/kde-4.3/bindings/default.nix deleted file mode 100644 index b060b06de6a..00000000000 --- a/pkgs/desktops/kde-4.3/bindings/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, lib, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4 -, libSM, libXrender, libXrandr, libXfixes, libXinerama, libXcursor, libXext, kdelibs}: - -# This function will only build the pykde4 module. I don't need the other bindings and -# some bindings are even broken. - -stdenv.mkDerivation { - name = "kdebindings-4.3.5"; - src = fetchurl { - url = mirror://kde/stable/4.3.5/src/kdebindings-4.3.5.tar.bz2; - sha256 = "1gjkdhrgr0nd1dqwf0v715xssyyazqrcs4zwp6dvb2fybpls7x3z"; - }; - builder = ./builder.sh; - includeAllQtDirs=true; - buildInputs = [ python sip pyqt4 zlib libpng freetype fontconfig qt4 - libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext kdelibs ]; - meta = { - description = "KDE bindings"; - longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python"; - license = "LGPL"; - homepage = http://www.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix deleted file mode 100644 index 6b0ecc5aeef..00000000000 --- a/pkgs/desktops/kde-4.3/default.nix +++ /dev/null @@ -1,295 +0,0 @@ -pkgs: - -pkgs.recurseIntoAttrs (rec { - inherit (pkgs) qt4; - -### SUPPORT - automoc4 = import ./support/automoc4 { - inherit (pkgs) stdenv fetchurl lib cmake; - inherit (pkgs) qt4; - }; - - phonon = import ./support/phonon { - inherit (pkgs) stdenv fetchurl lib cmake; - inherit (pkgs) qt4 gst_all xineLib; - inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs; - inherit automoc4; - }; - - strigi = import ./support/strigi { - inherit (pkgs) stdenv fetchurl lib cmake perl; - inherit (pkgs) bzip2 qt4 libxml2 expat exiv2 cluceneCore; - }; - - soprano = import ./support/soprano { - inherit (pkgs) stdenv fetchurl lib cmake; - inherit (pkgs) qt4 cluceneCore redland; - }; - - qimageblitz = import ./support/qimageblitz { - inherit (pkgs) stdenv fetchurl lib cmake qt4; - }; - - qca2 = import ./support/qca2 { - inherit (pkgs) stdenv fetchurl lib which qt4; - }; - - akonadi = import ./support/akonadi { - inherit (pkgs) stdenv fetchurl lib cmake qt4 shared_mime_info libxslt boost mysql; - inherit automoc4 soprano; - }; - - decibel = import ./support/decibel { - inherit (pkgs) stdenv fetchurl lib cmake qt4 tapioca_qt telepathy_qt; - }; - - eigen = import ./support/eigen { - inherit (pkgs) stdenv fetchurl lib cmake; - }; - - polkit_qt = import ./support/polkit-qt { - inherit (pkgs) stdenv fetchurl lib cmake qt4 policykit; - inherit automoc4; - }; - -### LIBS - kdelibs = import ./libs { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2 libxslt; - inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info - kerberos acl attr; - inherit automoc4 phonon strigi soprano; - }; - - kdelibs_experimental = import ./libs-experimental { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl; - inherit automoc4 kdelibs phonon; - }; - -### BASE - kdebase_workspace = import ./base-workspace { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python pam sip pyqt4; - inherit (pkgs) lm_sensors libxklavier libusb boost ConsoleKit; - inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs; - inherit kdelibs kdelibs_experimental kdepimlibs kdebindings; - inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt; - }; - - kdebase = import ./base { - inherit (pkgs) stdenv fetchurl lib cmake perl qt4 pciutils libraw1394; - inherit kdelibs kdebase_workspace; - inherit automoc4 phonon strigi qimageblitz soprano; - }; - - kdebase_runtime = import ./base-runtime { - inherit (pkgs) stdenv fetchurl lib cmake perl bzip2 xz qt4; - inherit (pkgs) shared_mime_info xineLib alsaLib samba cluceneCore; - inherit kdelibs; - inherit automoc4 phonon strigi soprano; - }; - - oxygen_icons = import ./oxygen-icons { - inherit (pkgs) stdenv fetchurl lib cmake; - }; - -### ADDITIONAL - - kdepimlibs = import ./pimlibs { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl boost cyrus_sasl gpgme; - inherit (pkgs) libical openldap shared_mime_info; - inherit kdelibs; - inherit automoc4 phonon akonadi; - }; - - kdeadmin = import ./admin { - inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer; - inherit kdelibs kdepimlibs kdebindings; - inherit automoc4 phonon; - }; - - kdeartwork = import ./artwork { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl xscreensaver; - inherit kdelibs kdebase_workspace; - inherit automoc4 phonon strigi eigen; - }; - - kdeaccessibility = import ./accessibility { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl alsaLib; - inherit (pkgs.xlibs) libXi libXtst; - inherit kdelibs; - inherit automoc4 phonon; - }; - - kdeedu = import ./edu { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt openbabel boost; - inherit (pkgs) readline gmm gsl facile ocaml xplanet; - inherit kdelibs; - inherit automoc4 phonon eigen; - }; - - kdegraphics = import ./graphics { - inherit (pkgs) stdenv fetchurl lib cmake perl qt4 exiv2 lcms saneBackends libgphoto2; - inherit (pkgs) libspectre djvulibre chmlib shared_mime_info; - inherit (pkgs.xlibs) libXxf86vm; - poppler = pkgs.popplerQt4; - inherit kdelibs; - inherit automoc4 phonon strigi qimageblitz soprano qca2; - }; - - kdemultimedia = import ./multimedia { - inherit (pkgs) stdenv fetchurl lib cmake perl qt4; - inherit (pkgs) alsaLib xineLib libvorbis flac taglib cdparanoia lame; - inherit kdelibs kdelibs_experimental; - inherit automoc4 phonon; - }; - - kdenetwork = import ./network { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib; - inherit (pkgs) libidn libvncserver tapioca_qt libmsn; - inherit (pkgs.xlibs) libXi libXtst libXdamage libXxf86vm; - inherit kdelibs kdepimlibs; - inherit automoc4 phonon qca2 soprano qimageblitz strigi; - }; - - kdepim = import ./pim { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl boost gpgme libassuan libgpgerror libxslt; - inherit (pkgs) shared_mime_info; - inherit (pkgs.xlibs) libXScrnSaver; - inherit kdelibs kdelibs_experimental kdepimlibs; - inherit automoc4 phonon akonadi strigi soprano qca2; - }; - - kdepim_runtime = import ./pim-runtime { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt boost; - inherit (pkgs) shared_mime_info; - inherit kdelibs kdelibs_experimental kdepimlibs; - inherit automoc4 phonon akonadi soprano strigi; - }; - - kdeplasma_addons = import ./plasma-addons { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python shared_mime_info; - inherit kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics kdeedu; - inherit automoc4 phonon soprano eigen qimageblitz; - }; - - kdegames = import ./games { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl; - inherit kdelibs; - inherit automoc4 phonon qca2; - }; - - kdetoys = import ./toys { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl; - inherit kdelibs kdebase_workspace; - inherit automoc4 phonon; - }; - - kdeutils = import ./utils { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups system_config_printer; - inherit kdelibs kdelibs_experimental kdepimlibs kdebase kdebindings; - inherit automoc4 phonon qimageblitz qca2; - }; - -### DEVELOPMENT - - kdebindings = import ./bindings { - inherit (pkgs) stdenv fetchurl lib python sip zlib libpng pyqt4 freetype fontconfig qt4; - inherit (pkgs.xlibs) libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext; - inherit kdelibs; - }; - - kdesdk = import ./sdk { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt boost subversion apr aprutil; - inherit kdelibs kdepimlibs; - inherit automoc4 phonon strigi; - }; - - kdewebdev = import ./webdev { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt boost; - inherit kdelibs kdepimlibs; - inherit automoc4 phonon; - }; - -#### EXTRA GEAR - - amarok = import ./extragear/amarok { - inherit (pkgs) stdenv fetchurl lib cmake qt4 qtscriptgenerator perl gettext; - inherit (pkgs) curl mysql libxml2 taglib taglib_extras loudmouth; - inherit kdelibs; - inherit automoc4 phonon strigi soprano qca2; - }; - - digikam = import ./extragear/digikam { - inherit (pkgs) stdenv fetchurl lib cmake qt4 lcms jasper libgphoto2 gettext; - inherit kdelibs kdepimlibs kdegraphics kdeedu; - inherit automoc4 phonon qimageblitz qca2 eigen; - }; - - filelight = import ./extragear/filelight { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl; - inherit kdelibs kdebase_workspace; - inherit automoc4 phonon qimageblitz; - }; - - kdesvn = import ./extragear/kdesvn { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4; - inherit kdelibs; - inherit automoc4 phonon; - }; - - kipiplugins = import ./extragear/kipi-plugins { - inherit (pkgs) stdenv fetchurl lib cmake qt4 libxml2 libxslt gettext; - inherit kdelibs kdepimlibs kdegraphics; - inherit automoc4 phonon qimageblitz qca2; - }; - - kmplayer = import ./extragear/kmplayer { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext dbus_glib; - inherit (pkgs.gtkLibs) pango gtk; - inherit kdelibs; - inherit automoc4 phonon; - }; - - krusader = import ./extragear/krusader { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext; - inherit kdelibs; - inherit automoc4 phonon; - }; - - koffice = import ./extragear/koffice { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew; - inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd; - inherit kdelibs kdepimlibs; - inherit automoc4 phonon qimageblitz qca2 eigen; - poppler = pkgs.popplerQt4; - }; - - ktorrent = import ./extragear/ktorrent { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp taglib boost gettext; - inherit kdelibs kdepimlibs kdebase_workspace; - inherit automoc4 phonon qca2; - }; - - konversation = import ./extragear/konversation { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext; - inherit (pkgs.xlibs) libXScrnSaver; - inherit kdelibs kdepimlibs; - inherit automoc4 phonon qca2; - }; - - gtk_qt_engine = import ./extragear/gtk-qt-engine { - inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext; - inherit (pkgs.xlibs) libX11; - inherit (pkgs.gtkLibs) gtk; - inherit (pkgs.gnome) libbonoboui; - inherit kdelibs; - inherit automoc4 phonon; - }; - -### LOCALIZATION - - l10n = pkgs.recurseIntoAttrs (import ./l10n { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext; - inherit kdelibs; - inherit automoc4 phonon; - }); -}) diff --git a/pkgs/desktops/kde-4.3/edu/default.nix b/pkgs/desktops/kde-4.3/edu/default.nix deleted file mode 100644 index 12d35165052..00000000000 --- a/pkgs/desktops/kde-4.3/edu/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl -, facile, ocaml, xplanet -, kdelibs, automoc4, phonon, eigen}: - -stdenv.mkDerivation { - name = "kdeedu-4.3.5"; - src = fetchurl { - url = mirror://kde/stable/4.3.5/src/kdeedu-4.3.5.tar.bz2; - sha256 = "0740wsakzl5aa50d02lank8mdhgrs9fllfd3ykhwd66lasxx55a4"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml xplanet - kdelibs automoc4 phonon eigen ]; - meta = { - description = "KDE Educative software"; - license = "GPL"; - homepage = http://www.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/extragear/amarok/builder.sh b/pkgs/desktops/kde-4.3/extragear/amarok/builder.sh deleted file mode 100644 index c19ba33ffcf..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/amarok/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "s|/usr|$loudmouth|g" cmake/modules/FindLoudmouth.cmake - sed -i -e "s|/usr|$mysql|g" cmake/modules/FindMySQLAmarok.cmake -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.3/extragear/amarok/default.nix b/pkgs/desktops/kde-4.3/extragear/amarok/default.nix deleted file mode 100644 index cf386756dc4..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/amarok/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth -, kdelibs, automoc4, phonon, strigi, soprano, qca2}: - -stdenv.mkDerivation { - name = "amarok-2.2.2"; - src = fetchurl { - url = mirror://kde/stable/amarok/2.2.2/src/amarok-2.2.2.tar.bz2; - sha256 = "0kg67b9wz2wi1gyn229vzbib4s0wpgqrjyfqy0032yl9fa2k13bn"; - }; - includeAllQtDirs=true; - inherit mysql loudmouth; - QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; - builder = ./builder.sh; - buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth - kdelibs automoc4 phonon strigi soprano qca2]; - meta = { - description = "Popular music player for KDE"; - license = "GPL"; - homepage = http://amarok.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/extragear/digikam/default.nix b/pkgs/desktops/kde-4.3/extragear/digikam/default.nix deleted file mode 100644 index 512912b7413..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/digikam/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, kdeedu, gettext}: - -stdenv.mkDerivation rec { - name = "digikam-1.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/digikam/${name}.tar.bz2"; - sha256 = "13zs5gwrzmqcx29r4vn96csz5hivycczjpa5l1157f5xhcg949kd"; - }; - - includeAllQtDirs=true; - buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen - lcms jasper libgphoto2 kdepimlibs gettext kdeedu ]; - cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; - meta = { - description = "Photo Management Program"; - license = "GPL"; - homepage = http://www.digikam.org; - maintainers = [ lib.maintainers.viric ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/desktops/kde-4.3/extragear/filelight/default.nix b/pkgs/desktops/kde-4.3/extragear/filelight/default.nix deleted file mode 100644 index f6cdfd4fcc8..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/filelight/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchurl, lib, cmake, qt4, perl, qimageblitz, kdelibs, kdebase_workspace, -automoc4, phonon}: - -stdenv.mkDerivation { - name = "filelight-1.9rc3"; - src = fetchurl { - url = http://www.kde-apps.org/CONTENT/content-files/99561-filelight-1.9rc3.tgz; - sha256 = "0ljyx23j4cvrsi1dvmxila82q2cd26barmcvc8qmr74kz6pj78sq"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon - qimageblitz ]; - meta = { - description = "Shows disk usage as an interactive map of concentric rings"; - license = "GPL"; - homepage = http://www.methylblue.com/filelight/; - maintainers = [ lib.maintainers.viric ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/extragear/gtk-qt-engine/builder.sh b/pkgs/desktops/kde-4.3/extragear/gtk-qt-engine/builder.sh deleted file mode 100644 index 259263ca27b..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/gtk-qt-engine/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -cmakeFlags="-DINSTALL_PATH_GTK_ENGINES=$out/lib/gtk-2.0/2.10.0/engines -DINSTALL_PATH_GTK_THEMES=$out/share/themes -DINSTALL_PATH_KCONTROL_MODULES=$out/lib"; - -myPatchPhase() -{ - sed -i -e "s|\${KDE4_INCLUDE_DIR}|\${KDE4_INCLUDE_DIR} ../build/kcm_gtk|" kcm_gtk/CMakeLists.txt - sed -i -e "s|\*.po|../../\*.po|" po/CMakeLists.txt -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.3/extragear/gtk-qt-engine/default.nix b/pkgs/desktops/kde-4.3/extragear/gtk-qt-engine/default.nix deleted file mode 100644 index 8a572ba39fb..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/gtk-qt-engine/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, libX11, gtk, libbonoboui, gettext, kdelibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "gtk-qt-engine-1.1"; - src = fetchurl { - url = http://gtk-qt-engine.googlecode.com/files/gtk-qt-engine-1.1.tar.bz2; - sha256 = "4310f8f179c5ab70cea614a07b0c3e84234d05388dded85596200fa754c290a6"; - }; - buildInputs = [ cmake qt4 perl libX11 gtk libbonoboui gettext kdelibs automoc4 phonon ]; - builder = ./builder.sh; -} diff --git a/pkgs/desktops/kde-4.3/extragear/kdesvn/builder.sh b/pkgs/desktops/kde-4.3/extragear/kdesvn/builder.sh deleted file mode 100644 index ed3b06c00c8..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/kdesvn/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "s|/usr|$subversion|g" src/svnqt/cmakemodules/FindSubversion.cmake -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.3/extragear/kdesvn/default.nix b/pkgs/desktops/kde-4.3/extragear/kdesvn/default.nix deleted file mode 100644 index ec3d8b5e012..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/kdesvn/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4 -, kdelibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "kdesvn-1.4.1"; - src = fetchurl { - url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.4.1.tar.bz2; - sha256 = "1xaankj3zl1wxm1zf9dayb9qwnp9s5xx964p83w7pcsir4h5959z"; - }; - includeAllQtDirs=true; - builder = ./builder.sh; - inherit subversion; - buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ]; - meta = { - description = "KDE SVN front-end"; - license = "GPL"; - homepage = http://kdesvn.alwins-world.de; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix b/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix deleted file mode 100644 index dae7b2a5d09..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, -kdegraphics, kdepimlibs, libxml2, libxslt, gettext}: - -stdenv.mkDerivation rec { - name = "kipi-plugins-1.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/kipi/${name}.tar.bz2"; - sha256 = "1fmjxl41lvyb6zv8wrg8sz0hb1jjynj2pwisynpbffglnxd09fwf"; - }; - - includeAllQtDirs=true; - buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs - libxml2 libxslt gettext ]; - cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; - meta = { - description = "Photo Management Program"; - license = "GPL"; - homepage = http://www.kipi-plugins.org; - maintainers = [ lib.maintainers.viric ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/desktops/kde-4.3/extragear/kmplayer/builder.sh b/pkgs/desktops/kde-4.3/extragear/kmplayer/builder.sh deleted file mode 100644 index 92c7515c9a9..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/kmplayer/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "s|files.length|files.size|" \ - -e "s|chlds.length|chlds.size|" src/kmplayerapp.cpp -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.3/extragear/kmplayer/default.nix b/pkgs/desktops/kde-4.3/extragear/kmplayer/default.nix deleted file mode 100644 index 05e25c265c4..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/kmplayer/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "kmplayer-0.11.1b"; - src = fetchurl { - url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.1b.tar.bz2; - sha256 = "04wzxxa83kxfzpsrllbdgl0kd6jj13kzhdkm2w66s7mpylr88lfi"; - }; - includeAllQtDirs=true; - builder = ./builder.sh; - buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ]; - meta = { - description = "MPlayer front-end for KDE"; - license = "GPL"; - homepage = http://kmplayer.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/extragear/koffice/default.nix b/pkgs/desktops/kde-4.3/extragear/koffice/default.nix deleted file mode 100644 index ded87af7240..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/koffice/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew -, shared_mime_info, poppler, gsl, gmm, wv2, libwpd -, kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen}: - -stdenv.mkDerivation { - name = "koffice-2.1.0"; - src = fetchurl { - url = mirror://kde/stable/koffice-2.1.0/koffice-2.1.0.tar.bz2; - sha256 = "1jdc2rvj5xqd66d152zmjz2psq44kbraqpl0fq05yjg2wz8kdsln"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info - poppler gsl gmm wv2 libwpd - kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen ]; - meta = { - description = "KDE integrated Office Suite"; - license = "GPL"; - homepage = http://www.koffice.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/extragear/konversation/default.nix b/pkgs/desktops/kde-4.3/extragear/konversation/default.nix deleted file mode 100644 index 565c3eeb510..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/konversation/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, libXScrnSaver -, kdelibs, kdepimlibs, automoc4, phonon, qca2}: - -stdenv.mkDerivation { - name = "konversation-1.2.1"; - src = fetchurl { - url = mirror://kde/stable/konversation/1.2.1/src/konversation-1.2.1.tar.bz2; - sha256 = "1rx4xgw14cfzkxghgn80np8i2ndq26sbdvv96g46r0s14qkdyq8w"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc libXScrnSaver kdelibs kdepimlibs automoc4 phonon qca2 ]; - patchPhase = '' - echo "include_directories(${qt4}/include/QtGui)" > tmp - cp src/CMakeLists.txt src/CMakeLists.bak - cat tmp src/CMakeLists.bak > src/CMakeLists.txt - ''; - meta = { - description = "Integrated IRC client for KDE"; - license = "GPL"; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/extragear/krusader/default.nix b/pkgs/desktops/kde-4.3/extragear/krusader/default.nix deleted file mode 100644 index 7b2926fd222..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/krusader/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, kdelibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "krusader-2.0.0"; - src = fetchurl { - url = mirror://sourceforge/krusader/krusader-2.0.0.tar.gz; - sha256 = "dc74c47d6eaf1c28165a74750e5a1b0341fa1c0d436658d0d5f85a6149f4852c"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ]; - patches = [./krusader-gcc44.patch]; - meta = { - description = "Norton/Total Commander clone for KDE"; - license = "GPL"; - homepage = http://www.krusader.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/extragear/krusader/krusader-gcc44.patch b/pkgs/desktops/kde-4.3/extragear/krusader/krusader-gcc44.patch deleted file mode 100644 index f8840d5f33c..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/krusader/krusader-gcc44.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp~ 2009-04-29 17:13:43.000000000 +0000 -+++ krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp 2009-04-29 17:14:01.000000000 +0000 -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - #include - #include - #include "virtualcopyjob.h" diff --git a/pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix b/pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix deleted file mode 100644 index 3bc8f66e098..00000000000 --- a/pkgs/desktops/kde-4.3/extragear/ktorrent/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{stdenv, fetchurl, lib, cmake, qt4, perl, gmp, taglib, boost, gettext, - kdelibs, kdepimlibs, kdebase_workspace, automoc4, phonon, qca2}: - -stdenv.mkDerivation { - name = "ktorrent-3.3.2"; - src = fetchurl { - url = http://ktorrent.org/downloads/3.3.2/ktorrent-3.3.2.tar.bz2; - sha256 = "08s67nz6wml5bx595czw2gcvrfb09hw1n1rzbj1n8iprr1abcpz1"; - }; - includeAllQtDirs=true; - cmakeFlags = "-DTASKMANAGER_INCLUDE_DIR=${kdebase_workspace}/include"; - buildInputs = [ cmake qt4 perl gmp taglib boost gettext stdenv.gcc.libc - kdelibs kdepimlibs kdebase_workspace automoc4 phonon qca2 ]; - meta = { - description = "KDE integrated BitTorrent client"; - license = "GPL"; - homepage = http://ktorrent.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/games/default.nix b/pkgs/desktops/kde-4.3/games/default.nix deleted file mode 100644 index 887b6ea727e..00000000000 --- a/pkgs/desktops/kde-4.3/games/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, qca2}: - -stdenv.mkDerivation { - name = "kdegames-4.3.5"; - src = fetchurl { - url = mirror://kde/stable/4.3.5/src/kdegames-4.3.5.tar.bz2; - sha256 = "1hl3m51awn6rz3z181sawbjw824d87r9c1rswdy7365szhsr7m66"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon qca2 ]; - meta = { - description = "KDE Games"; - homepage = http://www.kde.org; - license = "GPL"; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/graphics/default.nix b/pkgs/desktops/kde-4.3/graphics/default.nix deleted file mode 100644 index 39a6bf9e89f..00000000000 --- a/pkgs/desktops/kde-4.3/graphics/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, cmake, lib, perl, qt4, exiv2, lcms, saneBackends, libgphoto2 -, libspectre, poppler, djvulibre, chmlib, shared_mime_info, libXxf86vm -, kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}: - -stdenv.mkDerivation { - name = "kdegraphics-4.3.5"; - src = fetchurl { - url = mirror://kde/stable/4.3.5/src/kdegraphics-4.3.5.tar.bz2; - sha256 = "1n0gf6hvrd30rjnmk5m5rmyv35n1zp97ys04jrbc81k9yn1qfnma"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib - shared_mime_info stdenv.gcc.libc libXxf86vm - kdelibs automoc4 phonon strigi qimageblitz soprano qca2 ]; - meta = { - description = "KDE graphics utilities"; - longDescription = '' - Contains various graphics utilities such as the Gwenview image viewer and - Okular a document reader. - ''; - license = "GPL"; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/l10n/default.nix b/pkgs/desktops/kde-4.3/l10n/default.nix deleted file mode 100644 index 804e0ffadbc..00000000000 --- a/pkgs/desktops/kde-4.3/l10n/default.nix +++ /dev/null @@ -1,379 +0,0 @@ -# THIS IS A GENERATED FILE. DO NOT EDIT! -{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, kdelibs, automoc4, phonon}: - -let - - deriv = attr : stdenv.mkDerivation { - name = "kde-l10n-${attr.lang}-4.3.5"; - src = fetchurl { - url = attr.url; - sha256 = attr.sha256; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ]; - cmakeFlagsArray = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; - meta = { - description = "KDE l10n for ${attr.lang}"; - license = "GPL"; - homepage = http://www.kde.org; - }; - }; - -in -{ - - ar = deriv { - lang = "ar"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ar-4.3.5.tar.bz2"; - sha256 = "11781zszchvrp7ac6hhyhhf9n4c87n8x9m4cfc0ndg9scazm7dkg"; - }; - - bg = deriv { - lang = "bg"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-bg-4.3.5.tar.bz2"; - sha256 = "139if584x2cpzxwrav2cgjbknclcfk2k67jy8caxikzkjqi6z17q"; - }; - - bn_IN = deriv { - lang = "bn_IN"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-bn_IN-4.3.5.tar.bz2"; - sha256 = "0sygvwsc5b7dscpvy21zvvzshk48x81qvkpxrdl02wsd9xzfkk97"; - }; - - ca = deriv { - lang = "ca"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ca-4.3.5.tar.bz2"; - sha256 = "05bqqjnlm5xb7rcr4lry8na1znsjcm4gjjdphhlz87g3172h81sr"; - }; - - cs = deriv { - lang = "cs"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-cs-4.3.5.tar.bz2"; - sha256 = "13c2vqlfd65ryk1z2x2lx5m56is2sqxmasc2m8kpwxp1sb5cip0n"; - }; - - csb = deriv { - lang = "csb"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-csb-4.3.5.tar.bz2"; - sha256 = "1pg15wpiinbizia50cfmhaqyap52jcb1v3ymcz93dzin32s4ksvz"; - }; - - da = deriv { - lang = "da"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-da-4.3.5.tar.bz2"; - sha256 = "0inmvn425ykc3a0vq7gcf5igav3c3b9zhchmn440y124alm87zvl"; - }; - - de = deriv { - lang = "de"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-de-4.3.5.tar.bz2"; - sha256 = "01cmklxih5di3k1ga2qa690ff4zb1m4j1gnazcqg50c6z9rw8g2y"; - }; - - el = deriv { - lang = "el"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-el-4.3.5.tar.bz2"; - sha256 = "0qf3psm57w21sqnb8s8n599d9hp83fzqqwjdgq9xyd7jjsy2amlh"; - }; - - en_GB = deriv { - lang = "en_GB"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-en_GB-4.3.5.tar.bz2"; - sha256 = "0lkr64rk4sxszcz998k3xpnaz8hjz0l05gmm2pqrfl5ryi6l88nm"; - }; - - es = deriv { - lang = "es"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-es-4.3.5.tar.bz2"; - sha256 = "1aayj0zvw7if8x3qjzg4piyar70pbx5szq38i4h0vqqx4q2cv8ik"; - }; - - et = deriv { - lang = "et"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-et-4.3.5.tar.bz2"; - sha256 = "1ww4cgwmzbr23n5ilqjz92a0b3qa20fmyfll36pnphjrp0vmr4vr"; - }; - - eu = deriv { - lang = "eu"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-eu-4.3.5.tar.bz2"; - sha256 = "1ckydcs3aw36vfi4ik1qk6kkadl3gm8j7gf8z8wc86sn4hbpb75r"; - }; - - fi = deriv { - lang = "fi"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-fi-4.3.5.tar.bz2"; - sha256 = "13lv39vq65n5d2rlfy98512slwl3n0lh43j1la9r5gb7930z8w9j"; - }; - - fr = deriv { - lang = "fr"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-fr-4.3.5.tar.bz2"; - sha256 = "1a4rgwisfc7d6g7qvfd19jzkfhlaacf6shvm97af4hmdpb53jd9n"; - }; - - fy = deriv { - lang = "fy"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-fy-4.3.5.tar.bz2"; - sha256 = "03hd3m5fn4dp3qnqa6mfp1n6rs4irap3p7by0zg118m06cqpy30v"; - }; - - ga = deriv { - lang = "ga"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ga-4.3.5.tar.bz2"; - sha256 = "0hn0q0mc3yyhhl6xhmx8fqrbr1m79z2lv00k1mp11zjd1hpb0z1v"; - }; - - gl = deriv { - lang = "gl"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-gl-4.3.5.tar.bz2"; - sha256 = "1xv1zwzrbzc95g6l214yrhpp0ldxi1n2vq89gbp8zl0qf27d7jgd"; - }; - - gu = deriv { - lang = "gu"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-gu-4.3.5.tar.bz2"; - sha256 = "16rhzn9gdxnc3vr3l7j16pm249mh35041kfz607klzvifjr6ncpv"; - }; - - he = deriv { - lang = "he"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-he-4.3.5.tar.bz2"; - sha256 = "15xmc6i43f1jqmrslg067s28z10618ikfcfbyxxfp4bw02g2mgv8"; - }; - - hi = deriv { - lang = "hi"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-hi-4.3.5.tar.bz2"; - sha256 = "1l17rsqilf4r495bfhcxpbz03sxi74h0f5b3xhdl499qxg9c2frc"; - }; - - hne = deriv { - lang = "hne"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-hne-4.3.5.tar.bz2"; - sha256 = "0x9qdlgz6p6rqa8r1zgk6hxpq2v4sab4p6bm799qanq0jz50lbqw"; - }; - - hr = deriv { - lang = "hr"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-hr-4.3.5.tar.bz2"; - sha256 = "1raxh7w1vg6ic7ic61vl0px3c1jinyygzn1zhm29qn4k9in5b4sm"; - }; - - hu = deriv { - lang = "hu"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-hu-4.3.5.tar.bz2"; - sha256 = "08iladzh7ls8nyn1283a0g7phgq1yh0ng78apvhzvjhplpa0y2dk"; - }; - - is = deriv { - lang = "is"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-is-4.3.5.tar.bz2"; - sha256 = "0rnni9il5szllfks25jf8xplpv4i2qbqwppi0fimiwg71a1kabh5"; - }; - - it = deriv { - lang = "it"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-it-4.3.5.tar.bz2"; - sha256 = "0wpmx4sn9civkc05p6qc4g7yj6ypamipn206lzgdp2vdf2kfaqzc"; - }; - - ja = deriv { - lang = "ja"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ja-4.3.5.tar.bz2"; - sha256 = "07vm8lnkif9hry13fi2dqa7hnw384bajyn0p0p4p0yfb8ahf4983"; - }; - - kk = deriv { - lang = "kk"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-kk-4.3.5.tar.bz2"; - sha256 = "1bp9zyw6scwc0cmc6zncsj2mvh85llw0ynw2sa5cykhrmjyzmj58"; - }; - - km = deriv { - lang = "km"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-km-4.3.5.tar.bz2"; - sha256 = "1azymrqyiyab9w9v9x5csklcawssxqyx1i8ynndh3a9pkh5k7hca"; - }; - - kn = deriv { - lang = "kn"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-kn-4.3.5.tar.bz2"; - sha256 = "1yhgp7as9s75565b4b954k20slgrcsydwfjlx1cvlrk11hjj3d1w"; - }; - - ko = deriv { - lang = "ko"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ko-4.3.5.tar.bz2"; - sha256 = "09w9v28wxwlg452rff2zglqm8pr2idd2c7p3l20jdi8539skz0cj"; - }; - - ku = deriv { - lang = "ku"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ku-4.3.5.tar.bz2"; - sha256 = "0hgi8kabb4z581m10qmc2nj99m1mij9ah4sjmrc605fr65cmj70i"; - }; - - lt = deriv { - lang = "lt"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-lt-4.3.5.tar.bz2"; - sha256 = "0mdw5lz0z6qg2wigmxz0kb7png80zbnnwnal101xxa3x1bdyvn2y"; - }; - - lv = deriv { - lang = "lv"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-lv-4.3.5.tar.bz2"; - sha256 = "1kf7hw35j0j9fwld6xp7gs9849qxw2wsszshj6q6a7w4fnwkb6ka"; - }; - - mai = deriv { - lang = "mai"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-mai-4.3.5.tar.bz2"; - sha256 = "1dy9vryip9qrjdwgk9cqan1xjxw46nz61jnsv982i4x5x7rbv8h4"; - }; - - mk = deriv { - lang = "mk"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-mk-4.3.5.tar.bz2"; - sha256 = "1j2mmag8xvm1h37sdvr4n6zsgrhlkx5z6zzca8gb0i14xy79653v"; - }; - - ml = deriv { - lang = "ml"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ml-4.3.5.tar.bz2"; - sha256 = "02lcbm1rnv1cwwipx1hacwpc3yd7xi5liy7ibdrfk8b11iqvqizy"; - }; - - mr = deriv { - lang = "mr"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-mr-4.3.5.tar.bz2"; - sha256 = "0dh5a16f4rcdz9jl3zs6qn27x3r7b0xicyl8kh95a2qix8s3x7cg"; - }; - - nb = deriv { - lang = "nb"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-nb-4.3.5.tar.bz2"; - sha256 = "1g7xpk34lhbsr4qc008dhafs5w9w2wimwf815pwnzpc4phdd6dkf"; - }; - - nds = deriv { - lang = "nds"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-nds-4.3.5.tar.bz2"; - sha256 = "0dc7q482jlcxzwkrkkjp1np2mqrhzs0pmambwqcqrpriqk4l6c1i"; - }; - - nl = deriv { - lang = "nl"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-nl-4.3.5.tar.bz2"; - sha256 = "0l086ivwanliw841v1wdg3xi68c4dss1bdhg9zi6wy6girv3mld8"; - }; - - nn = deriv { - lang = "nn"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-nn-4.3.5.tar.bz2"; - sha256 = "191kvzya9c4yjd4kkrn23skqg1g695n8r4lwvlkzy7lwxl5pg8cf"; - }; - - pa = deriv { - lang = "pa"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-pa-4.3.5.tar.bz2"; - sha256 = "02by85vkj8w60q5azqbcif00lcmfa9rg8kkzhh25nh6iqmv7z8g1"; - }; - - pl = deriv { - lang = "pl"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-pl-4.3.5.tar.bz2"; - sha256 = "13cj00da6l52zblvvfcv6cxb43qchf20pfmh524fpqy98r2px5lf"; - }; - - pt = deriv { - lang = "pt"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-pt-4.3.5.tar.bz2"; - sha256 = "067pgn8w5hr6y049mh9481lwy26ljr11nnpnj6qfyfrh4cqf42ms"; - }; - - pt_BR = deriv { - lang = "pt_BR"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-pt_BR-4.3.5.tar.bz2"; - sha256 = "00wv1lzcfqphcn5x57wgd0afzn708mhf3rvwy68rkvnh24vr0731"; - }; - - ro = deriv { - lang = "ro"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ro-4.3.5.tar.bz2"; - sha256 = "1x1lcnindcm50ady5v0wfl8xzjvjw146iavd4jf0iv301w7f44jb"; - }; - - ru = deriv { - lang = "ru"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-ru-4.3.5.tar.bz2"; - sha256 = "0xa27l2wyy8n2ipippm1rcwpcrav08kq4dmjm1j1z9i9bi8d3ply"; - }; - - sk = deriv { - lang = "sk"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-sk-4.3.5.tar.bz2"; - sha256 = "0cnf97bc9rx1nwbpmvrgfvfmkh0bm3r4bhyxwl2nqh7ik7h6x3gp"; - }; - - sl = deriv { - lang = "sl"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-sl-4.3.5.tar.bz2"; - sha256 = "0snm1hsnnjxdw67qr97ng49jcnfjssdxm2dvfwz3k5ggv5dvrhmb"; - }; - - sr = deriv { - lang = "sr"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-sr-4.3.5.tar.bz2"; - sha256 = "0kxg77vdb8nbs3wpczmkwr51gghvzqlc0zpnhg4xqd2h3nwppm41"; - }; - - sv = deriv { - lang = "sv"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-sv-4.3.5.tar.bz2"; - sha256 = "1gb7xc7d7dm35znfxxkg42lb5g0i3vh3sz5mv69qdn24j6nzqrxg"; - }; - - tg = deriv { - lang = "tg"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-tg-4.3.5.tar.bz2"; - sha256 = "17j9nbimyvgsa3j0bcy4kzlksl64m1wflwmymsl73a0lk0f1djyc"; - }; - - th = deriv { - lang = "th"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-th-4.3.5.tar.bz2"; - sha256 = "125w3s0zva8z48a5ni34qqhyppvka81rd840y6q70c9v0n3alw53"; - }; - - tr = deriv { - lang = "tr"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-tr-4.3.5.tar.bz2"; - sha256 = "1f9prapy96yxvnl1gmvxbccy5ibjv0mn21a3mf9li7yvnjblpav3"; - }; - - uk = deriv { - lang = "uk"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-uk-4.3.5.tar.bz2"; - sha256 = "0gyyb75d0vd841bkkr6n3w3a375qr74yfiz1ccsnsjdkbigpm5x7"; - }; - - wa = deriv { - lang = "wa"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-wa-4.3.5.tar.bz2"; - sha256 = "0hq4nnhll53g7kmw2xzg0kj5zg4cg19gfbnxv94s9lkn5djkigaw"; - }; - - zh_CN = deriv { - lang = "zh_CN"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-zh_CN-4.3.5.tar.bz2"; - sha256 = "0fgjm04pby0nal85cvjrzxan4nmiqzykfq39b2c3q2ispikra0jr"; - }; - - zh_TW = deriv { - lang = "zh_TW"; - url = "mirror://kde/stable/4.3.5/src/kde-l10n/kde-l10n-zh_TW-4.3.5.tar.bz2"; - sha256 = "10gphism03i7xk02afbf2ndr1h5c54slix2b3hvzj4klqxq0ai8p"; - }; - -} diff --git a/pkgs/desktops/kde-4.3/l10n/generate-expr-from-tarballs.pl b/pkgs/desktops/kde-4.3/l10n/generate-expr-from-tarballs.pl deleted file mode 100755 index 54d01cbfbc2..00000000000 --- a/pkgs/desktops/kde-4.3/l10n/generate-expr-from-tarballs.pl +++ /dev/null @@ -1,102 +0,0 @@ -#! /usr/bin/perl -w - -# Typical command to generate the list of tarballs: - -# export i="mirror://kde/stable/4.3.5/src/kde-l10n/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs.list -# manually update extra.list -# then run: cat tarballs.list extra.list old.list | perl ./generate-expr-from-tarballs.pl - -use strict; - -my $tmpDir = "/tmp/xorg-unpack"; - - -my %pkgURLs; -my %pkgHashes; -my %pkgNames; - -my $downloadCache = "./download-cache"; -$ENV{'NIX_DOWNLOAD_CACHE'} = $downloadCache; -mkdir $downloadCache, 0755; - -while (<>) { - chomp; - my $tarball = "$_"; - print "\nDOING TARBALL $tarball\n"; - - $tarball =~ /\/((?:(?:[A-Za-z0-9_]|(?:-[^0-9])|(?:-[0-9]*[a-z]))+))[^\/]*$/; - die unless defined $1; - my $pkg = $1; - $pkg =~ s/kde-l10n-//g; - - $tarball =~ /\/([^\/]*)\.tar\.bz2$/; - my $pkgName = $pkg; - - print " $pkg $pkgName\n"; - - if (defined $pkgNames{$pkg}) { - print " SKIPPING\n"; - next; - } - - $pkgNames{$pkg} = $pkgName; - $pkgURLs{$pkg} = $tarball; - - my ($hash, $path) = `PRINT_PATH=1 QUIET=1 nix-prefetch-url '$tarball'`; - chomp $hash; - chomp $path; - $pkgHashes{$pkg} = $hash; - - print "done\n"; -} - - -print "\nWRITE OUT\n"; - -open OUT, ">default.nix"; - -print OUT ""; -print OUT <" $A > tmp; - < tmp updateinfile $A - fi - done -} - -# Apply the version update to all nix files but l10n from '.' -find . -\( -name *.nix -and -not -path "*l10n*" -\) | updatefiles diff --git a/pkgs/desktops/kde-4.3/utils/builder.sh b/pkgs/desktops/kde-4.3/utils/builder.sh deleted file mode 100644 index c1ec2b7e1cd..00000000000 --- a/pkgs/desktops/kde-4.3/utils/builder.sh +++ /dev/null @@ -1,13 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - for i in printer-applet/cmake-modules/FindSystemConfigPrinter.py printer-applet/printer-applet.py - do - sed -i -e "s|/usr/share/system-config-printer|$system_config_printer/share/system-config-printer|" $i - done - - sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" printer-applet/cmake-modules/FindSystemConfigPrinter.py -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.3/utils/default.nix b/pkgs/desktops/kde-4.3/utils/default.nix deleted file mode 100644 index 5ed19962e94..00000000000 --- a/pkgs/desktops/kde-4.3/utils/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, gmp, python, libzip, libarchive, xz -, sip, pyqt4, pycups, system_config_printer -, kdelibs, kdelibs_experimental, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}: - -stdenv.mkDerivation { - name = "kdeutils-4.3.5"; - - src = fetchurl { - url = mirror://kde/stable/4.3.5/src/kdeutils-4.3.5.tar.bz2; - sha256 = "0c19yx1z1mdz1mzhpwic5k9wkk6j0ahmsc9swkfr05j5fbnjvzn7"; - }; - - builder = ./builder.sh; - - inherit system_config_printer; - - includeAllQtDirs=true; - - - buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4 pycups system_config_printer - kdelibs kdelibs_experimental kdepimlibs kdebase kdebindings automoc4 phonon qimageblitz qca2 ]; - - meta = { - description = "KDE Utilities"; - license = "GPL"; - homepage = http://www.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.3/webdev/default.nix b/pkgs/desktops/kde-4.3/webdev/default.nix deleted file mode 100644 index f8948f498ed..00000000000 --- a/pkgs/desktops/kde-4.3/webdev/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, boost -, kdelibs, kdepimlibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "kdewebdev-4.3.5"; - src = fetchurl { - url = mirror://kde/stable/4.3.5/src/kdewebdev-4.3.5.tar.bz2; - sha256 = "0lm07pnicvv66npqzhz82q3rx236kcvqv6ismxrll4q7b7gr2xxl"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ]; - meta = { - description = "KDE Web development utilities"; - license = "GPL"; - homepage = http://www.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/superkaramba/builder.sh b/pkgs/desktops/superkaramba/builder.sh deleted file mode 100755 index 83332db6fd2..00000000000 --- a/pkgs/desktops/superkaramba/builder.sh +++ /dev/null @@ -1,15 +0,0 @@ -source $stdenv/setup - -echo $xlibs2 -echo $x_libraries_env - -postConfigure() { - pwd; - ls -l super*/src/Makefile; - x_libraries_env_s=$(echo $x_libraries_env | sed 's/\//\\\//g') - sed -e "s/x_libraries = \/usr\/lib/x_libraries = $x_libraries_env_s/" -i super*/src/Makefile; - sed -e "s/x_libraries = \/usr\/lib/x_libraries = $x_libraries_env_s/" -i super*/Makefile; - sed -e "s/x_libraries = \/usr\/lib/x_libraries = $x_libraries_env_s/" -i Makefile; -} - -genericBuild diff --git a/pkgs/desktops/superkaramba/default.nix b/pkgs/desktops/superkaramba/default.nix deleted file mode 100644 index e3d9642b4be..00000000000 --- a/pkgs/desktops/superkaramba/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, fetchurl, kdebase, kdelibs, zlib, libjpeg, perl, qt3, python, libpng, freetype, expat -, libX11, libXext, libXt, libXaw, libXpm -}: - -with stdenv.lib; - -stdenv.mkDerivation rec{ - name = "superkaramba-0.39"; - builder = ./builder.sh; - - xlibs = [ libX11 libXext libXt libXaw libXpm ]; - - src = fetchurl { - url = mirror://sourceforge/netdragon/superkaramba-0.39.tar.gz; - sha256 = "5f3ab793a08d368f37c6abe4362ab929cbb3da3b1993e285a69180a44e0d8441"; - }; - - /* - There is an installation error in jpeg support. You seem to have only one - of either the headers _or_ the libraries installed. You may need to either - provide correct --with-extra-... options, or the development package of - libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/ - Disabling JPEG support. - - Warning: you chose to install this package in /nix/store/85a3dz1xxk138yav67yds93pgqrpi21y-superkaramba-0.39, - but KDE was found in /nix/store/zl3k1cxf9pfipi7kz1hf4y87w54hjd5b-kdelibs-3.5.6. - For this to work, you will need to tell KDE about the new prefix, by ensuring - that KDEDIRS contains it, e.g. export KDEDIRS=/nix/store/85a3dz1xxk138yav67yds93pgqrpi21y-superkaramba-0.39:/nix/store/zl3k1cxf9pfipi7kz1hf4y87w54hjd5b-kdelibs-3.5.6 - Then restart KDE. - - Comments: - I see that its missing: hddtemp, sensors based on its output. - Not all plugins work but some do. - TODO: make this a dependecy of KDE3/4 - - */ - - configureFlags = " - --without-arts - --with-pythondir=${python} - "; - - #xlibs2 attrByPath (attrName: builtins.getAttr attrName xlibs) (builtins.attrNames xlibs); - #x_libraries_env = concatStringsSep ":" (map (p: "${p}/lib") xlibs2); - - x_libraries_env = concatStringsSep ":" (map (p: "${p}/lib") xlibs); - - buildInputs = [ kdebase kdelibs zlib libjpeg perl qt3 python libpng freetype expat ] ++ xlibs; - -} diff --git a/pkgs/tools/system/filelight/default.nix b/pkgs/tools/system/filelight/default.nix deleted file mode 100644 index 63200198489..00000000000 --- a/pkgs/tools/system/filelight/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, fetchurl, kdelibs, qt, x11, zlib, perl, libpng}: - -stdenv.mkDerivation { - name = "filelight-1.0"; - - src = fetchurl { - url = http://www.methylblue.com/filelight/packages/filelight-1.0.tar.bz2; - sha256 = "1mj5q8i818b6qlmjgfk984agp9n72pxi7p7caixzmcm1c2gd8hq7"; - }; - - buildInputs = [kdelibs qt x11 zlib perl libpng]; - - configureFlags = "--without-debug --without-arts"; - - preConfigure = '' - sed -e 's/.*sys_lib_\(dl\)\{0,1\}search_path_spec=.*/:/' -i configure - sed -e '/X_LDFLAGS=/d' -i configure - ''; - - meta = { - description = "A tool for analysing which directories and files eat your disk space"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f53da7f1062..495ba477a33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8747,18 +8747,6 @@ let inherit (kde3) kdelibs; }; - gwenview = import ../applications/graphics/gwenview { - inherit stdenv fetchurl exiv2 zlib libjpeg perl libpng expat qt3; - inherit (kde3) kdelibs; - inherit (xlibs) libXt libXext; - }; - - digikam = import ../applications/graphics/digikam { - inherit stdenv fetchurl exiv2 zlib libjpeg perl libpng expat qt3 cmake; - inherit (kde3) kdelibs; - inherit (xlibs) libXt libXext; - }; - k3b = import ../applications/misc/k3b { inherit stdenv fetchurl x11 zlib libpng libjpeg perl qt3; inherit (kde3) kdelibs; @@ -8778,13 +8766,6 @@ let qt = qt3; }; - konversation = import ../applications/networking/irc/konversation { - inherit fetchurl stdenv perl zlib libpng libjpeg expat; - inherit (xlibs) libX11 libXt libXext libXrender libXft; - inherit (kde3) arts kdelibs; - qt = qt3; - }; - kphone = import ../applications/networking/kphone { inherit fetchurl lib autoconf automake libtool pkgconfig openssl libpng alsaLib; qt = qt3; @@ -8806,33 +8787,9 @@ let qt = qt3; }; - filelight = import ../tools/system/filelight { - inherit fetchurl stdenv x11 zlib perl libpng; - inherit (kde3) kdelibs; - qt = qt3; - }; - - superkaramba = import ../desktops/superkaramba { - inherit stdenv fetchurl zlib libjpeg - perl qt3 python libpng freetype expat; - inherit (xlibs) libX11 libXext libXt libXaw libXpm; - inherit (kde3) kdelibs kdebase; - }; - }; - kde4 = recurseIntoAttrs ( - if (getPkgConfig "kde" "version" "4.4") == "4.4" then - kde44 - else - kde43 - ); - - kde43 = makeOverridable (import ../desktops/kde-4.3) (pkgs // { - openexr = openexr_1_6_1; - qt4 = qt45; - popplerQt4 = popplerQt45; - }); + kde4 = kde44; kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // { openexr = openexr_1_6_1; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 35a9de63c7c..f9c612a42f3 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -424,44 +424,6 @@ with (import ./release-lib.nix); k3b = linux; kcachegrind = linux; kile = linux; - konversation = linux; - }; - - kde43 = { - kdelibs = linux; - kdelibs_experimental = linux; - kdebase_workspace = linux; - kdebase = linux; - kdebase_runtime = linux; - oxygen_icons = linux; - kdepimlibs = linux; - kdeadmin = linux; - kdeartwork = linux; - kdeaccessibility = linux; - kdeedu = linux; - kdegraphics = linux; - kdemultimedia = linux; - kdenetwork = linux; - kdepim = linux; - kdepim_runtime = linux; - kdeplasma_addons = linux; - kdegames = linux; - kdetoys = linux; - kdeutils = linux; - kdesdk = linux; - kdewebdev = linux; - krusader = linux; - kmplayer = linux; - ktorrent = linux; - koffice = linux; - konversation = linux; - kdesvn = linux; - amarok = linux; - l10n.ca = linux; - l10n.de = linux; - l10n.fr = linux; - l10n.nl = linux; - l10n.ru = linux; }; kde44 = { From a60cdda3c6b64aa2edf1d99e744428cabdc3905b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Apr 2010 17:29:36 +0000 Subject: [PATCH 192/313] Remove qt-4.4 svn path=/nixpkgs/trunk/; revision=21012 --- pkgs/development/libraries/qt-4.4/default.nix | 70 ------------------- .../libraries/qt-4.4/setup-hook.sh | 9 --- pkgs/top-level/all-packages.nix | 14 ---- 3 files changed, 93 deletions(-) delete mode 100644 pkgs/development/libraries/qt-4.4/default.nix delete mode 100644 pkgs/development/libraries/qt-4.4/setup-hook.sh diff --git a/pkgs/development/libraries/qt-4.4/default.nix b/pkgs/development/libraries/qt-4.4/default.nix deleted file mode 100644 index a378a9dd94b..00000000000 --- a/pkgs/development/libraries/qt-4.4/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -args: with args; - -stdenv.mkDerivation { - name = "qt-4.4.3"; - - src = fetchurl { - url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.3.tar.bz2; - sha256 = "1nfdf1aj6vb7qyacsnjyjxrnaf44hz7vzykf6zra2znd87pglz51"; - }; - - setupHook = ./setup-hook.sh; - - propagatedBuildInputs = [ - libXft - libXrender - libXrandr - randrproto - xextproto - libXinerama - xineramaproto - libXcursor - zlib - libjpeg - mysql - libpng - which - mesa - libXmu - openssl - dbus.libs - cups - pkgconfig - libXext - freetype - fontconfig - inputproto - fixesproto - libXfixes - glib - libtiff - ]; - - prefixKey = "-prefix "; - - configureFlags = '' - -v -no-separate-debug-info -release - -system-zlib -system-libpng -system-libjpeg -fast - -qt-gif -confirm-license - -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql - -qdbus -cups -glib -xfixes -dbus-linked - -fontconfig -I${freetype}/include/freetype2 - ''; - - patchPhase = '' - substituteInPlace configure --replace /bin/pwd pwd - sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf - ''; - - # Remove the documentation: it takes up >= 130 MB, which is more - # than half of the installed size. Ideally we should put this in a - # separate package (as well as the Qt Designer). - postInstall = '' - rm -rf $out/doc - ''; - - meta = { - homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp; - description = "A cross-platform application framework for C++"; - }; -} diff --git a/pkgs/development/libraries/qt-4.4/setup-hook.sh b/pkgs/development/libraries/qt-4.4/setup-hook.sh deleted file mode 100644 index f9ecacbbb7d..00000000000 --- a/pkgs/development/libraries/qt-4.4/setup-hook.sh +++ /dev/null @@ -1,9 +0,0 @@ -export QTDIR=@out@ - -if [ -n "$includeAllQtDirs" ]; then - # This helps for g++, but not for moc. And no qt4 package should expect - # having all qt4 header files dirs into -I. - for d in @out@/include/*; do - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d" - done -fi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 495ba477a33..ebacbee4599 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4818,11 +4818,6 @@ let qt4Support = false; }; - popplerQt44 = poppler.override { - qt4Support = true; - qt4 = qt44; - }; - popplerQt45 = poppler.override { qt4Support = true; qt4 = qt45; @@ -4859,15 +4854,6 @@ let qt4 = qt46; - qt44 = import ../development/libraries/qt-4.4 { - inherit fetchurl stdenv fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus - fontconfig freetype pkgconfig libtiff; - inherit (xlibs) xextproto libXft libXrender libXrandr randrproto - libXmu libXinerama xineramaproto libXcursor libICE libSM libX11 libXext - inputproto fixesproto libXfixes; - inherit (gnome) glib; - }; - qt45 = import ../development/libraries/qt-4.5 { inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus fontconfig freetype pkgconfig libtiff; From afe0368b9a15d53ddc6bd2543e60dea14fe5f81c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Apr 2010 18:58:35 +0000 Subject: [PATCH 193/313] Bump to calibre-0.6.47 svn path=/nixpkgs/trunk/; revision=21013 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 694b799e738..ba064be23cb 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-0.6.45"; + name = "calibre-0.6.47"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.gz"; - sha256 = "167qmhj4cp5z3skmhkip7axajqha13qnmxk0rgc8mwvc7kr5q98h"; + sha256 = "16s5rqlwbyq4al8xl5qr8ha6nyhcyd8q9gzm8pbi3q0ksda2k2qi"; }; inherit python; From 64cff1da4e6fca4e1fa857264d3333c6fd52b31f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Apr 2010 18:58:43 +0000 Subject: [PATCH 194/313] Add calibreQt46. Please, test svn path=/nixpkgs/trunk/; revision=21014 --- pkgs/top-level/all-packages.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebacbee4599..82232107832 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5362,8 +5362,6 @@ let inherit stdenv fetchurl rpm cpio python wirelesstools gettext; }; - sip = sip48; - sip48 = import ../development/python-modules/python-sip { inherit stdenv fetchurl python; }; @@ -5372,11 +5370,10 @@ let inherit stdenv fetchurl python; }; - pyqt4 = pyqt45; - pyqt45 = import ../development/python-modules/pyqt { - inherit stdenv fetchurl python sip; + inherit stdenv fetchurl python; qt4 = qt45; + sip = sip48; }; pyqt47 = import ../development/python-modules/pyqt/4.7.nix { @@ -6866,14 +6863,22 @@ let inherit fetchurl stdenv ncurses; }; - calibre = import ../applications/misc/calibre { + calibre = makeOverridable (import ../applications/misc/calibre) { inherit stdenv fetchurl libpng imagemagick pkgconfig libjpeg fontconfig podofo - qt4 makeWrapper unrar sip pyqt4 pil chmlib; + qt4 makeWrapper unrar pil chmlib; python = python26Full; popplerQt4 = popplerQt45; + pyqt4 = pyqt45; + sip = sip48; inherit (python26Packages) mechanize lxml dateutil cssutils beautifulsoap; }; + calibreQt46 = calibre.override { + popplerQt4 = popplerQt46; + pyqt4 = pyqt47; + sip = sip410; + }; + carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell aspell gettext ncurses avahi dbus dbus_glib python From 62bcea0382e6e5ab7733f911fb3093723496de7c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Apr 2010 21:03:43 +0000 Subject: [PATCH 195/313] Remove linuxwacom: it is not compatible with new xserver svn path=/nixpkgs/trunk/; revision=21016 --- pkgs/misc/linuxwacom/0.8.4.x.nix | 5 ----- pkgs/misc/linuxwacom/0.8.5.x.nix | 5 ----- pkgs/misc/linuxwacom/10-wacom.rules | 3 --- pkgs/misc/linuxwacom/wacom.nix | 32 ----------------------------- pkgs/top-level/all-packages.nix | 12 ----------- pkgs/top-level/release.nix | 1 - 6 files changed, 58 deletions(-) delete mode 100644 pkgs/misc/linuxwacom/0.8.4.x.nix delete mode 100644 pkgs/misc/linuxwacom/0.8.5.x.nix delete mode 100644 pkgs/misc/linuxwacom/10-wacom.rules delete mode 100644 pkgs/misc/linuxwacom/wacom.nix diff --git a/pkgs/misc/linuxwacom/0.8.4.x.nix b/pkgs/misc/linuxwacom/0.8.4.x.nix deleted file mode 100644 index a8bd129664e..00000000000 --- a/pkgs/misc/linuxwacom/0.8.4.x.nix +++ /dev/null @@ -1,5 +0,0 @@ -args: (import ./wacom.nix) (args // -{ - version = "0.8.4-4"; - hash = "1cydd8906y923llxf9s1fvzb26dbcfvzlgasmlqpa75p98fnnrpz"; -}) diff --git a/pkgs/misc/linuxwacom/0.8.5.x.nix b/pkgs/misc/linuxwacom/0.8.5.x.nix deleted file mode 100644 index 89114bbc75d..00000000000 --- a/pkgs/misc/linuxwacom/0.8.5.x.nix +++ /dev/null @@ -1,5 +0,0 @@ -args: (import ./wacom.nix) (args // -{ - version = "0.8.5-12"; - hash = "0i4dx3gh7f56id5ca60l9s3ypxnwn6gg4w9a6jzkbgzbipknn71k"; -}) diff --git a/pkgs/misc/linuxwacom/10-wacom.rules b/pkgs/misc/linuxwacom/10-wacom.rules deleted file mode 100644 index ac7632a776d..00000000000 --- a/pkgs/misc/linuxwacom/10-wacom.rules +++ /dev/null @@ -1,3 +0,0 @@ -# udev rule to create /dev/input/wacomN for wacom tablets - -KERNEL="event*", SYSFS{manufacturer}="WACOM", NAME="input/%k", SYMLINK="input/wacom%e" diff --git a/pkgs/misc/linuxwacom/wacom.nix b/pkgs/misc/linuxwacom/wacom.nix deleted file mode 100644 index 9493bc832bc..00000000000 --- a/pkgs/misc/linuxwacom/wacom.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, libX11, libXi, inputproto -, xproto, ncurses, pkgconfig, xorgserver, version, hash }: - -stdenv.mkDerivation rec { - name = "linuxwacom-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = hash; - }; - - buildInputs = [ libX11 libXi inputproto xproto ncurses pkgconfig xorgserver ]; - - preConfigure = '' - ./configure --enable-wacomdrv --prefix=$out \ - --with-xlib --with-xorg-sdk --enable-wacdump --enable-xsetwacom \ - --with-xmoduledir=$out/lib/xorg/modules/input - mv configure configure.removed - ''; - - postInstall = - '' - ensureDir $out/etc/udev/rules.d - cp ${./10-wacom.rules} $out/etc/udev/rules.d/10-wacom.rules - ''; - - meta = { - maintainers = with stdenv.lib.maintainers; [raskin urkud]; - description = "Wacom digitizer driver for X11"; - homepage = http://linuxwacom.sourceforge.net; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82232107832..de1cbf12324 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9066,18 +9066,6 @@ let flex = flex2535; }; - linuxwacom = linuxwacom_0_8_5; - - linuxwacom_0_8_5 = import ../misc/linuxwacom/0.8.5.x.nix { - inherit fetchurl stdenv ncurses pkgconfig; - inherit (xorg) libX11 libXi xproto inputproto xorgserver; - }; - - linuxwacom_0_8_4 = import ../misc/linuxwacom/0.8.4.x.nix { - inherit fetchurl stdenv ncurses pkgconfig; - inherit (xorg) libX11 libXi xproto inputproto xorgserver; - }; - martyr = import ../development/libraries/martyr { inherit stdenv fetchurl apacheAnt; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f9c612a42f3..a320c5a4bc2 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -173,7 +173,6 @@ with (import ./release-lib.nix); libtool_2 = all; libxml2 = all; libxslt = all; - linuxwacom = linux; lout = linux; lsh = linux; lsof = linux; From 8ff59ce09c9fed1a0a760eced59b22ec113a03f4 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Apr 2010 21:03:51 +0000 Subject: [PATCH 196/313] Remove old sip and pyqt svn path=/nixpkgs/trunk/; revision=21017 --- pkgs/development/python-modules/pyqt/4.7.nix | 22 ---------- .../python-modules/pyqt/default.nix | 6 +-- .../python-modules/python-sip/4.10.nix | 20 --------- .../python-modules/python-sip/default.nix | 8 ++-- pkgs/top-level/all-packages.nix | 42 +++---------------- 5 files changed, 13 insertions(+), 85 deletions(-) delete mode 100644 pkgs/development/python-modules/pyqt/4.7.nix delete mode 100644 pkgs/development/python-modules/python-sip/4.10.nix diff --git a/pkgs/development/python-modules/pyqt/4.7.nix b/pkgs/development/python-modules/pyqt/4.7.nix deleted file mode 100644 index eb09a32d00c..00000000000 --- a/pkgs/development/python-modules/pyqt/4.7.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, fetchurl, python, sip, qt4}: - -stdenv.mkDerivation { - name = "pyqt-x11-gpl-4.7.2"; - - src = fetchurl { - url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.2.tar.gz; - sha256 = "097gxdr7jqv5a58z89djylm2b21x83crqn2fjsr5zmwhc0zwj5yv"; - }; - - configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins"; - - buildInputs = [ python sip qt4 ]; - - meta = { - description = "Python bindings for Qt"; - license = "GPL"; - homepage = http://www.riverbankcomputing.co.uk; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index 4357a4c0ed0..eb09a32d00c 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, python, sip, qt4}: stdenv.mkDerivation { - name = "pyqt-x11-gpl-4.5.4"; + name = "pyqt-x11-gpl-4.7.2"; src = fetchurl { - url = http://pyqwt.sourceforge.net/support/PyQt-x11-gpl-4.5.4.tar.gz; # Not downloading from riverbank, since they remove older releases - sha256 = "1a55zng6yhnbk5swc02bkbyccdgf0f0v94yxk9v5a43hv9xnrl5k"; + url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.2.tar.gz; + sha256 = "097gxdr7jqv5a58z89djylm2b21x83crqn2fjsr5zmwhc0zwj5yv"; }; configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins"; diff --git a/pkgs/development/python-modules/python-sip/4.10.nix b/pkgs/development/python-modules/python-sip/4.10.nix deleted file mode 100644 index c64d7be52f7..00000000000 --- a/pkgs/development/python-modules/python-sip/4.10.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, python }: - -stdenv.mkDerivation rec { - name = "sip-4.10.1"; - - src = fetchurl { - url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz"; - sha256 = "16pdk86amcl4hnc9vv2y1ihl8ym9hjkh49andm4jahv4630qhc9h"; - }; - - configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include"; - - buildInputs = [ python ]; - - meta = { - description = "Creates C++ bindings for Python modules"; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.sander ]; - }; -} diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix index 3fb827e4600..c64d7be52f7 100644 --- a/pkgs/development/python-modules/python-sip/default.nix +++ b/pkgs/development/python-modules/python-sip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: -stdenv.mkDerivation { - name = "sip-4.8.2"; +stdenv.mkDerivation rec { + name = "sip-4.10.1"; src = fetchurl { - url = http://pyqwt.sourceforge.net/support/sip-4.8.2.tar.gz; # Not downloading from riverbank, since they remove older releases - sha256 = "1afr2qaibzgf8fq4fmc31jz9hvbwxbg5jvl68ygvkkdvnbg2kfrf"; + url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz"; + sha256 = "16pdk86amcl4hnc9vv2y1ihl8ym9hjkh49andm4jahv4630qhc9h"; }; configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de1cbf12324..612343cd707 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4818,14 +4818,9 @@ let qt4Support = false; }; - popplerQt45 = poppler.override { + popplerQt4 = poppler.override { + inherit qt4; qt4Support = true; - qt4 = qt45; - }; - - popplerQt46 = poppler.override { - qt4Support = true; - qt4 = qt46; }; popt = import ../development/libraries/popt { @@ -5362,24 +5357,12 @@ let inherit stdenv fetchurl rpm cpio python wirelesstools gettext; }; - sip48 = import ../development/python-modules/python-sip { + sip = import ../development/python-modules/python-sip { inherit stdenv fetchurl python; }; - sip410 = import ../development/python-modules/python-sip/4.10.nix { - inherit stdenv fetchurl python; - }; - - pyqt45 = import ../development/python-modules/pyqt { - inherit stdenv fetchurl python; - qt4 = qt45; - sip = sip48; - }; - - pyqt47 = import ../development/python-modules/pyqt/4.7.nix { - inherit stdenv fetchurl python; - qt4 = qt46; - sip = sip410; + pyqt4 = import ../development/python-modules/pyqt { + inherit stdenv fetchurl python qt4 sip; }; pyx = import ../development/python-modules/pyx { @@ -6865,20 +6848,11 @@ let calibre = makeOverridable (import ../applications/misc/calibre) { inherit stdenv fetchurl libpng imagemagick pkgconfig libjpeg fontconfig podofo - qt4 makeWrapper unrar pil chmlib; + qt4 makeWrapper unrar pil chmlib popplerQt4 pyqt4 sip; python = python26Full; - popplerQt4 = popplerQt45; - pyqt4 = pyqt45; - sip = sip48; inherit (python26Packages) mechanize lxml dateutil cssutils beautifulsoap; }; - calibreQt46 = calibre.override { - popplerQt4 = popplerQt46; - pyqt4 = pyqt47; - sip = sip410; - }; - carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell aspell gettext ncurses avahi dbus dbus_glib python @@ -8784,10 +8758,6 @@ let kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // { openexr = openexr_1_6_1; - qt4 = qt46; - popplerQt4 = popplerQt46; - sip = sip410; - pyqt4 = pyqt47; }); ### SCIENCE From e90a24df10487b80dc5082df0c98f57c598ea85e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Apr 2010 21:03:59 +0000 Subject: [PATCH 197/313] s/\t/ / Blame Raskin for tabs in all-packages.nix. svn path=/nixpkgs/trunk/; revision=21018 --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 612343cd707..e62c8702df3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3558,9 +3558,9 @@ let extremetuxracer = builderDefsPackage (import ../games/extremetuxracer) { inherit mesa tcl freeglut SDL SDL_mixer pkgconfig - libpng gettext intltool; + libpng gettext intltool; inherit (xlibs) libX11 xproto libXi inputproto - libXmu libXext xextproto libXt libSM libICE; + libXmu libXext xextproto libXt libSM libICE; }; eventlog = import ../development/libraries/eventlog { @@ -3870,7 +3870,7 @@ let inherit (gtkLibs) glib pango gtk; inherit (gnome) gnomevfs /* <- only passed for the no longer used older versions it is deprecated and didn't build on amd64 due to samba dependency */ gtkdoc - libsoup; + libsoup; }); gnet = import ../development/libraries/gnet { From a9d1a2825b2ddbb7f0dfe6efe579dbc07bb1fee1 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Apr 2010 22:42:28 +0000 Subject: [PATCH 198/313] Initial xf86-input-wacom nix expression Builds here. Haven't tested whether it works with real hardware yet. svn path=/nixpkgs/trunk/; revision=21019 --- .../linux/xf86-input-wacom/10-wacom.rules | 3 ++ .../linux/xf86-input-wacom/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/os-specific/linux/xf86-input-wacom/10-wacom.rules create mode 100644 pkgs/os-specific/linux/xf86-input-wacom/default.nix diff --git a/pkgs/os-specific/linux/xf86-input-wacom/10-wacom.rules b/pkgs/os-specific/linux/xf86-input-wacom/10-wacom.rules new file mode 100644 index 00000000000..aa9865ac637 --- /dev/null +++ b/pkgs/os-specific/linux/xf86-input-wacom/10-wacom.rules @@ -0,0 +1,3 @@ +-# udev rule to create /dev/input/wacomN for wacom tablets +- +-KERNEL="event*", SYSFS{manufacturer}="WACOM", NAME="input/%k", SYMLINK="input/wacom%e" diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix new file mode 100644 index 00000000000..b1468a18990 --- /dev/null +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, libX11, libXi, inputproto, file +, xproto, ncurses, pkgconfig, xorgserver }: + +stdenv.mkDerivation rec { + name = "xf86-input-wacom-0.10.5"; + + src = fetchurl { + url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; + sha256 = "07rg9a9n1dyjff4awlc5imy44y0lg59qs8h4rr56lgjg612wkmy0"; + }; + + buildInputs = [ libX11 libXi inputproto xproto ncurses pkgconfig xorgserver + file ]; + + patchPhase="sed -e s@/usr/bin/file@${file}/bin/file@g -i configure"; + + preConfigure = '' + configureFlags="--with-xorg-module-dir=$out/lib/xorg/modules/input + --with-sdkdir=$out/include/xorg" + ''; + + postInstall = + '' + ensureDir $out/etc/udev/rules.d + cp ${./10-wacom.rules} $out/etc/udev/rules.d/10-wacom.rules + ''; + + meta = { + maintainers = with stdenv.lib.maintainers; [urkud]; + description = "Wacom digitizer driver for X11"; + homepage = http://linuxwacom.sourceforge.net; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e62c8702df3..640134b0687 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6474,6 +6474,11 @@ let inherit fetchurl stdenv qt4 imagemagick inkscape; }; + xf86_input_wacom = import ../os-specific/linux/xf86-input-wacom { + inherit stdenv fetchurl ncurses pkgconfig file; + inherit (xorg) libX11 libXi inputproto xproto xorgserver; + }; + xmoto = builderDefsPackage (import ../games/xmoto) { inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf From 6123776f3666c054d6f107aac626a4931eddf7da Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 12 Apr 2010 08:57:45 +0000 Subject: [PATCH 199/313] man-pages-3.24 svn path=/nixpkgs/trunk/; revision=21020 --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 5b042515c84..b305ab8bbac 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "man-pages-3.22"; + name = "man-pages-3.24"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2"; - sha256 = "0b6x5jajbrqls2yvy1xzgr1c4jhs1cp8pid07a34m6wipjr6b5kg"; + sha256 = "0038v3ddg0mpg2iakdhgd5bg69xw4625si91nf1b0vrh9791fiz4"; }; preBuild = From 69857a11c7c0251659ad896bf35060e8245c0aac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Apr 2010 11:21:22 +0000 Subject: [PATCH 200/313] pkgs/development/tools/build-managers/scons: bumped to version 1.3.0 svn path=/nixpkgs/trunk/; revision=21025 --- pkgs/development/tools/build-managers/scons/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index afe63182a2d..2e72047354c 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, python, makeWrapper}: stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.3.0"; name = "scons-" + version; src = fetchurl { url = "mirror://sourceforge/scons/${name}.tar.gz"; - sha256 = "2806451e02a42789decb6d08098b798b6b81a0a39d8d3b2fbdd3fe84ebd8a246"; + sha256 = "4bde47b9a40fe767f089f5996d56b6e85a2d4929309b9c07a2dff363a78b0002"; }; propagatedBuildInputs = [python makeWrapper]; @@ -25,4 +25,6 @@ stdenv.mkDerivation rec { software. ''; }; + + maintainers = [ stdenv.lib.maintainers.simons ]; } From 2185e04b882f648b500a83be40706f331a0eff55 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Apr 2010 11:21:29 +0000 Subject: [PATCH 201/313] pkgs/applications/version-management/git-and-tools/git: bumped version to 1.7.0.4 svn path=/nixpkgs/trunk/; revision=21026 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index aae8676b9c3..52889dbdaab 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { - name = "git-1.7.0.3"; + name = "git-1.7.0.4"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "f68774019b52ac462da48a5315ce1f4dcd64a2327de4a14d13014bdc0c50f841"; + sha256 = "ff283c3799c3f9719d0512bb23cf8854e1934f1ed36f2058b931d8f1c0b63430"; }; patches = [ ./docbook2texi.patch ]; From 0526f2fb2ceeaa4f84bd73870f5fd89fcf0cf84b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Apr 2010 11:21:34 +0000 Subject: [PATCH 202/313] pkgs/tools/networking/pdsh: added myself as a maintainer svn path=/nixpkgs/trunk/; revision=21027 --- pkgs/tools/networking/pdsh/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 7e5cef8f4ed..3ea7a7bdd5c 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -39,4 +39,6 @@ stdenv.mkDerivation rec { + " --disable-dependency-tracking" + " --disable-debug" ; + + maintainers = [ stdenv.lib.maintainers.simons ]; } From 425d964e7d7281b62139983e9962e0c5816402dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Apr 2010 11:21:38 +0000 Subject: [PATCH 203/313] pkgs/applications/science/math/maxima: added myself as a maintainer svn path=/nixpkgs/trunk/; revision=21028 --- pkgs/applications/science/math/maxima/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index edee18ed2b3..0e9c285a55e 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -18,4 +18,6 @@ stdenv.mkDerivation { description = "Maxima computer algebra system"; homepage = http://maxima.sourceforge.net; }; + + maintainers = [ stdenv.lib.maintainers.simons ]; } From 774a276ff3d9c0957db4ac7e6b00ee4852c1537f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Apr 2010 11:21:42 +0000 Subject: [PATCH 204/313] pkgs/development/interpreters/maude: added myself as a maintainer svn path=/nixpkgs/trunk/; revision=21029 --- .../development/interpreters/maude/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index ccf0c53daec..c41c17c6e3c 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -2,34 +2,34 @@ stdenv.mkDerivation rec { name = "maude-2.4"; - + meta = { homepage = "http://maude.cs.uiuc.edu/"; description = "Maude -- a high-level specification language"; license = "GPLv2"; }; - + src = fetchurl { url = "http://maude.cs.uiuc.edu/download/current/Maude-2.4.tar.gz"; sha256 = "0bydkf8fd5v267bfak4mm5lmm3vvnr6ir1jr7gimgyzqygdk0in2"; }; - + fullMaude = fetchurl { url = "http://maude.cs.uiuc.edu/download/current/FM2.4/full-maude24.maude"; sha256 = "9e4ebdc717dc968d0b6c1179f360e60b3a39ea8cecc1a7fa49f2105bbddc48c4"; }; - + docs = fetchurl { url = "http://mirror.switch.ch/mirror/gentoo/distfiles/maude-2.3.0-extras.tar.bz2"; sha256 = "0kd5623k1wwj1rk4b6halrm3sdvd9kbiwg1hi2c3qim1nlfdgl0d"; }; - + buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper]; - + configurePhase = ''./configure --disable-dependency-tracking --prefix=$out --datadir=$out/share/maude TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"''; - + doCheck = true; - + postInstall = '' for n in $out/bin/*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done @@ -42,4 +42,6 @@ stdenv.mkDerivation rec { mv maude-2.3.0-extras/pdfs $out/share/doc/maude/pdf mv maude-2.3.0-extras/* $out/share/doc/maude/ ''; + + maintainers = [ stdenv.lib.maintainers.simons ]; } From cf70c1ecbc3b0ff71f41eb10c1bd76be5055f178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 12 Apr 2010 18:48:38 +0000 Subject: [PATCH 205/313] Updating ruby libs - the same as there were svn path=/nixpkgs/trunk/; revision=21031 --- pkgs/development/interpreters/ruby/libs.nix | 377 +++++++++----------- 1 file changed, 175 insertions(+), 202 deletions(-) diff --git a/pkgs/development/interpreters/ruby/libs.nix b/pkgs/development/interpreters/ruby/libs.nix index 1b135b2b747..40be24210fd 100644 --- a/pkgs/development/interpreters/ruby/libs.nix +++ b/pkgs/development/interpreters/ruby/libs.nix @@ -80,6 +80,10 @@ let libs = cat ${patch} | gunzip | patch -p 1; ''; }; + + xapian_full = { + buildInputs = [ libs.rake pkgs.zlib pkgs.libuuid ]; + }; }; rubyDerivation = args : @@ -153,6 +157,22 @@ let libs = # This section has been generated by gem nix sup chronic rubygems-update xrefresh-server rb-inotify jeweler # the gem nix command has been added by a nix patch to ruby gems + json_pure_1_2_4 = rubyDerivation { + name = "ruby-json_pure-1.2.4"; # full_name + nameNoVersion = "json_pure"; + propagatedBuildInputs = [ ]; + src = fetchurl { + url = "http://gems.rubyforge.org/gems/json_pure-1.2.4.gem"; + sha256 = "1j3lwa20659qb5rvsnzxd6qlr0m56fyppgdhxc7v4phdsw3im4bp"; + }; + meta = { + homepage = "http://flori.github.com/json"; + license = []; # one of ? + description = "This is a JSON implementation in pure Ruby[...]"; + longDescription = "This is a JSON implementation in pure Ruby."; + }; + }; + rake_0_8_7 = rubyDerivation { name = "ruby-rake-0.8.7"; # full_name nameNoVersion = "rake"; @@ -169,22 +189,6 @@ let libs = }; }; - ferret_0_11_6 = rubyDerivation { - name = "ruby-ferret-0.11.6"; # full_name - nameNoVersion = "ferret"; - propagatedBuildInputs = [ ]; - src = fetchurl { - url = "http://gems.rubyforge.org/gems/ferret-0.11.6.gem"; - sha256 = "0q0zdrmfm41ijf1n19s85vg34b1a558x5cnwmbb8fc8kzxklzbih"; - }; - meta = { - homepage = "http://ferret.davebalmain.com/trac"; - license = []; # one of ? - description = "Ferret is a port of the Java Lucene project[...]"; - longDescription = "Ferret is a port of the Java Lucene project. It is a powerful indexing and search library."; - }; - }; - git_1_2_5 = rubyDerivation { name = "ruby-git-1.2.5"; # full_name nameNoVersion = "git"; @@ -201,16 +205,32 @@ let libs = }; }; - rubygems_update_1_3_5 = rubyDerivation { - name = "ruby-rubygems-update-1.3.5"; # full_name + json_1_2_4 = rubyDerivation { + name = "ruby-json-1.2.4"; # full_name + nameNoVersion = "json"; + propagatedBuildInputs = [ ]; + src = fetchurl { + url = "http://gems.rubyforge.org/gems/json-1.2.4.gem"; + sha256 = "1wdj91bl7xabgkwpz285b8086v5898x72h4lxl11n750652mrrax"; + }; + meta = { + homepage = "http://flori.github.com/json"; + license = []; # one of ? + description = "This is a JSON implementation as a Ruby extension in C[...]"; + longDescription = "This is a JSON implementation as a Ruby extension in C."; + }; + }; + + rubygems_update_1_3_6 = rubyDerivation { + name = "ruby-rubygems-update-1.3.6"; # full_name nameNoVersion = "rubygems_update"; propagatedBuildInputs = [ ]; src = fetchurl { - url = "http://gems.rubyforge.org/gems/rubygems-update-1.3.5.gem"; - sha256 = "1idzrbnl24ldxz8dmn8lz466avsn1w0rbc35lyp92fd3ar2b23qj"; + url = "http://gems.rubyforge.org/gems/rubygems-update-1.3.6.gem"; + sha256 = "1fqbm9hmy3skj9s98v8k0qghdmli7kv84wlm0m4grsrdn26xw14l"; }; meta = { - homepage = "http://rubygems.rubyforge.org/"; + homepage = "http://rubygems.org/"; license = []; # one of ? description = "RubyGems is a package management framework for Ruby This gem is an update for the RubyGems software. You must have an in"; # cut to 120 chars longDescription = "RubyGems is a package management framework for Ruby. @@ -222,11 +242,11 @@ See Gem for information on RubyGems (or `ri Gem`) To upgrade to the latest RubyGems, run: - $ gem install --system # you might need to be an administrator or root + $ gem update --system # you might need to be an administrator or root NOTE: RubyGems 1.1 and 1.2 have problems upgrading when there is no rubygems-update installed. You will need to use the following instructions -if you see "Nothing to update". +if you see \"Nothing to update\". If you have an older version of RubyGems installed, then you can still do it in two steps: @@ -247,54 +267,6 @@ For more details and other options, see: }; }; - net_ssh_2_0_17 = rubyDerivation { - name = "ruby-net-ssh-2.0.17"; # full_name - nameNoVersion = "net_ssh"; - propagatedBuildInputs = [ ]; - src = fetchurl { - url = "http://gems.rubyforge.org/gems/net-ssh-2.0.17.gem"; - sha256 = "0qswvcmq91sfii3cfr6myws2ncch9l4yzd09070yn5a3wsx4i6r5"; - }; - meta = { - homepage = "http://rubyforge.org/projects/net-ssh/"; - license = []; # one of ? - description = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol[...]"; - longDescription = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."; - }; - }; - - rb_inotify_0_4_0 = rubyDerivation { - name = "ruby-rb-inotify-0.4.0"; # full_name - nameNoVersion = "rb_inotify"; - propagatedBuildInputs = [ ffi_0_5_4 ]; - src = fetchurl { - url = "http://gems.rubyforge.org/gems/rb-inotify-0.4.0.gem"; - sha256 = "17wanfs4jmp8c3sslb7a947ay9k78fhm1nls87cgpssmynpsmbvl"; - }; - meta = { - homepage = "http://github.com/nex3/rb-notify"; - license = []; # one of ? - description = "A Ruby wrapper for Linux's inotify, using FFI[...]"; - longDescription = "A Ruby wrapper for Linux's inotify, using FFI"; - }; - }; - - term_ansicolor_1_0_4 = rubyDerivation { - name = "ruby-term-ansicolor-1.0.4"; # full_name - nameNoVersion = "term_ansicolor"; - propagatedBuildInputs = [ ]; - src = fetchurl { - url = "http://gems.rubyforge.org/gems/term-ansicolor-1.0.4.gem"; - sha256 = "0pvyr3f0kk17nap1bm0myziskd8wn3kwba7zmp3zxks8icn0sa5j"; - }; - meta = { - homepage = "http://term-ansicolor.rubyforge.org"; - license = []; # one of ? - description = "[...]"; - longDescription = ""; - }; - }; - chronic_0_2_3 = rubyDerivation { name = "ruby-chronic-0.2.3"; # full_name nameNoVersion = "chronic"; @@ -327,13 +299,29 @@ For more details and other options, see: }; }; - ffi_0_5_4 = rubyDerivation { - name = "ruby-ffi-0.5.4"; # full_name + xapian_full_1_1_3_4 = rubyDerivation { + name = "ruby-xapian-full-1.1.3.4"; # full_name + nameNoVersion = "xapian_full"; + propagatedBuildInputs = [ ]; + src = fetchurl { + url = "http://gems.rubyforge.org/gems/xapian-full-1.1.3.4.gem"; + sha256 = "0yc08y7v5yh0lfidc0rkr072q88jvp5prv7pllv4qn4wryna8mwl"; + }; + meta = { + homepage = ""; + license = []; # one of ? + description = "Xapian bindings for Ruby without dependency on system Xapian library[...]"; + longDescription = "Xapian bindings for Ruby without dependency on system Xapian library"; + }; + }; + + ffi_0_6_3 = rubyDerivation { + name = "ruby-ffi-0.6.3"; # full_name nameNoVersion = "ffi"; propagatedBuildInputs = [ rake_0_8_7 ]; src = fetchurl { - url = "http://gems.rubyforge.org/gems/ffi-0.5.4.gem"; - sha256 = "1kxa1ljcl1907kav400w43n9fdw535qr7klj06wx1bnyaq7bfnik"; + url = "http://gems.rubyforge.org/gems/ffi-0.6.3.gem"; + sha256 = "08qnxqcnjq4i2vv1jfwdxdlsphqjrrh7r0cw8x2q0x9vjd27ncbb"; }; meta = { homepage = "http://wiki.github.com/ffi/ffi"; @@ -347,35 +335,39 @@ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi]."; }; }; - fastthread_1_0_7 = rubyDerivation { - name = "ruby-fastthread-1.0.7"; # full_name - nameNoVersion = "fastthread"; + term_ansicolor_1_0_5 = rubyDerivation { + name = "ruby-term-ansicolor-1.0.5"; # full_name + nameNoVersion = "term_ansicolor"; propagatedBuildInputs = [ ]; src = fetchurl { - url = "http://gems.rubyforge.org/gems/fastthread-1.0.7.gem"; - sha256 = "003ngap8rmwsl4bvf44hz8q4ajm9d0sbn38pm28dajng3pm8q6mx"; + url = "http://gems.rubyforge.org/gems/term-ansicolor-1.0.5.gem"; + sha256 = "1xhcc4dkfylj14w413pmd8jhc04wj3nlw0xa6qy9h0fnbbyh6bc1"; }; meta = { - homepage = ""; + homepage = "http://flori.github.com/term-ansicolor"; license = []; # one of ? - description = "Optimized replacement for thread[...]"; - longDescription = "Optimized replacement for thread.rb primitives"; + description = "[...]"; + longDescription = ""; }; }; - gemcutter_0_3_0 = rubyDerivation { - name = "ruby-gemcutter-0.3.0"; # full_name - nameNoVersion = "gemcutter"; + trollop_1_16_2 = rubyDerivation { + name = "ruby-trollop-1.16.2"; # full_name + nameNoVersion = "trollop"; propagatedBuildInputs = [ ]; src = fetchurl { - url = "http://gems.rubyforge.org/gems/gemcutter-0.3.0.gem"; - sha256 = "07rm04lj5rb093gf1w87rzkj9gr1pkyd5frs716wn5gd4c1silik"; + url = "http://gems.rubyforge.org/gems/trollop-1.16.2.gem"; + sha256 = "0frrp90dw266h3kf9g925dppir9l7p8jxknw6dn5nz6fa6c4g5lg"; }; meta = { - homepage = "http://gemcutter.org"; + homepage = "http://trollop.rubyforge.org"; license = []; # one of ? - description = "Adds several commands to RubyGems for managing gems and more on Gemcutter[...]"; - longDescription = "Adds several commands to RubyGems for managing gems and more on Gemcutter.org."; + description = "Trollop is a commandline option parser for Ruby that just gets out of your way For that, you get a nice automatically-gen"; # cut to 120 chars + longDescription = "Trollop is a commandline option parser for Ruby that just +gets out of your way. One line of code per option is all you need to write. +For that, you get a nice automatically-generated help page, robust option +parsing, command subcompletion, and sensible defaults for everything you don't +specify."; }; }; @@ -414,13 +406,61 @@ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi]."; }; }; - rubyforge_2_0_3 = rubyDerivation { - name = "ruby-rubyforge-2.0.3"; # full_name - nameNoVersion = "rubyforge"; - propagatedBuildInputs = [ json_pure_1_2_0 ]; + xrefresh_server_0_3_0 = rubyDerivation { + name = "ruby-xrefresh-server-0.3.0"; # full_name + nameNoVersion = "xrefresh_server"; + propagatedBuildInputs = [ json_1_2_4 term_ansicolor_1_0_5 ]; src = fetchurl { - url = "http://gems.rubyforge.org/gems/rubyforge-2.0.3.gem"; - sha256 = "1ck9hkad55dy25819v4gd1nmnpvcrb3i4np3hc03h1j6q8qpxg5p"; + url = "http://gems.rubyforge.org/gems/xrefresh-server-0.3.0.gem"; + sha256 = "1k80hadnmaxi8q8fw879xaj0ragy4bmqjqm7zjkv9bq8njb3i0c5"; + }; + meta = { + homepage = "http://github.com/darwin/xrefresh-server"; + license = []; # one of ? + description = "XRefresh is browser refresh automation for web developers[...]"; + longDescription = "XRefresh is browser refresh automation for web developers"; + }; + }; + + net_ssh_2_0_21 = rubyDerivation { + name = "ruby-net-ssh-2.0.21"; # full_name + nameNoVersion = "net_ssh"; + propagatedBuildInputs = [ ]; + src = fetchurl { + url = "http://gems.rubyforge.org/gems/net-ssh-2.0.21.gem"; + sha256 = "0wjfv68gn297vhb0r9qhlij9p7qnkn4afav0nylr6avrsd8mgdc4"; + }; + meta = { + homepage = "http://github.com/net-ssh/net-ssh"; + license = []; # one of ? + description = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol[...]"; + longDescription = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."; + }; + }; + + gemcutter_0_5_0 = rubyDerivation { + name = "ruby-gemcutter-0.5.0"; # full_name + nameNoVersion = "gemcutter"; + propagatedBuildInputs = [ ]; + src = fetchurl { + url = "http://gems.rubyforge.org/gems/gemcutter-0.5.0.gem"; + sha256 = "16pf64d0mj320llars6x1zl0vhv2x8vh7pwgqj0k48pyh5426iim"; + }; + meta = { + homepage = "http://rubygems.org"; + license = []; # one of ? + description = "Adds several commands to RubyGems for managing gems and more on RubyGems[...]"; + longDescription = "Adds several commands to RubyGems for managing gems and more on RubyGems.org."; + }; + }; + + rubyforge_2_0_4 = rubyDerivation { + name = "ruby-rubyforge-2.0.4"; # full_name + nameNoVersion = "rubyforge"; + propagatedBuildInputs = [ json_pure_1_2_4 ]; + src = fetchurl { + url = "http://gems.rubyforge.org/gems/rubyforge-2.0.4.gem"; + sha256 = "1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1"; }; meta = { homepage = "http://codeforpeople.rubyforge.org/rubyforge/"; @@ -437,19 +477,19 @@ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi]."; }; }; - xrefresh_server_0_3_0 = rubyDerivation { - name = "ruby-xrefresh-server-0.3.0"; # full_name - nameNoVersion = "xrefresh_server"; - propagatedBuildInputs = [ json_1_2_0 term_ansicolor_1_0_4 ]; + rb_inotify_0_7_1 = rubyDerivation { + name = "ruby-rb-inotify-0.7.1"; # full_name + nameNoVersion = "rb_inotify"; + propagatedBuildInputs = [ ffi_0_6_3 ]; src = fetchurl { - url = "http://gems.rubyforge.org/gems/xrefresh-server-0.3.0.gem"; - sha256 = "1k80hadnmaxi8q8fw879xaj0ragy4bmqjqm7zjkv9bq8njb3i0c5"; + url = "http://gems.rubyforge.org/gems/rb-inotify-0.7.1.gem"; + sha256 = "00q2zl9361ji5z7blgipphsjvnysyw016vbb0vh6f5i5v6fz5bzh"; }; meta = { - homepage = "http://github.com/darwin/xrefresh-server"; + homepage = "http://github.com/nex3/rb-notify"; license = []; # one of ? - description = "XRefresh is browser refresh automation for web developers[...]"; - longDescription = "XRefresh is browser refresh automation for web developers"; + description = "A Ruby wrapper for Linux's inotify, using FFI[...]"; + longDescription = "A Ruby wrapper for Linux's inotify, using FFI"; }; }; @@ -486,42 +526,30 @@ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi]."; }; }; - highline_1_5_1 = rubyDerivation { - name = "ruby-highline-1.5.1"; # full_name + highline_1_5_2 = rubyDerivation { + name = "ruby-highline-1.5.2"; # full_name nameNoVersion = "highline"; propagatedBuildInputs = [ ]; src = fetchurl { - url = "http://gems.rubyforge.org/gems/highline-1.5.1.gem"; - sha256 = "0sawb011sc1i5glr80a4iflr0vvn3s5c97a4jmrhj3palv4df19i"; + url = "http://gems.rubyforge.org/gems/highline-1.5.2.gem"; + sha256 = "0l25zris20drrwkhxx9hplq7g353xh960y5i19fdb7g84jl4bp19"; }; meta = { homepage = "http://highline.rubyforge.org"; license = []; # one of ? - description = "A high-level IO library that provides validation, type conversion, and more for command-line interfaces[...]"; - longDescription = "A high-level IO library that provides validation, type conversion, and more for command-line interfaces. HighLine also includes a complete menu system that can crank out anything from simple list selection to complete shells with just minutes of work."; - }; - }; - - json_pure_1_2_0 = rubyDerivation { - name = "ruby-json_pure-1.2.0"; # full_name - nameNoVersion = "json_pure"; - propagatedBuildInputs = [ ]; - src = fetchurl { - url = "http://gems.rubyforge.org/gems/json_pure-1.2.0.gem"; - sha256 = "162lzzbadp62q1fjf5zyg45qly9pryjh7f6xhnf04zbjiq815pc5"; - }; - meta = { - homepage = "http://json.rubyforge.org"; - license = []; # one of ? - description = "This is a JSON implementation in pure Ruby[...]"; - longDescription = "This is a JSON implementation in pure Ruby."; + description = "A high-level IO library that provides validation, type conversion, and more for command-line interfaces crank out anythin"; # cut to 120 chars + longDescription = "A high-level IO library that provides validation, type conversion, and more for +command-line interfaces. HighLine also includes a complete menu system that can +crank out anything from simple list selection to complete shells with just +minutes of work. +"; }; }; jeweler_1_4_0 = rubyDerivation { name = "ruby-jeweler-1.4.0"; # full_name nameNoVersion = "jeweler"; - propagatedBuildInputs = [ git_1_2_5 rubyforge_2_0_3 gemcutter_0_3_0 ]; + propagatedBuildInputs = [ git_1_2_5 rubyforge_2_0_4 gemcutter_0_5_0 ]; src = fetchurl { url = "http://gems.rubyforge.org/gems/jeweler-1.4.0.gem"; sha256 = "0hsz38wc37k1zzmy1jjvsqj6am14n410bbxk1dhq55cgapnwm3kb"; @@ -534,29 +562,13 @@ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi]."; }; }; - json_1_2_0 = rubyDerivation { - name = "ruby-json-1.2.0"; # full_name - nameNoVersion = "json"; - propagatedBuildInputs = [ ]; - src = fetchurl { - url = "http://gems.rubyforge.org/gems/json-1.2.0.gem"; - sha256 = "0srfhr38g322l4lcnzsa6kzp64i9p24ai2bmh5wl0xx2g925b7n7"; - }; - meta = { - homepage = "http://json.rubyforge.org"; - license = []; # one of ? - description = "This is a JSON implementation as a Ruby extension in C[...]"; - longDescription = "This is a JSON implementation as a Ruby extension in C."; - }; - }; - - sup_0_9_1 = rubyDerivation { - name = "ruby-sup-0.9.1"; # full_name + sup_0_11 = rubyDerivation { + name = "ruby-sup-0.11"; # full_name nameNoVersion = "sup"; - propagatedBuildInputs = [ ferret_0_11_6 ncurses_0_9_1 rmail_1_0_0 highline_1_5_1 net_ssh_2_0_17 trollop_1_15 lockfile_1_4_3 mime_types_1_16 gettext_2_1_0 fastthread_1_0_7 ]; + propagatedBuildInputs = [ xapian_full_1_1_3_4 ncurses_0_9_1 rmail_1_0_0 highline_1_5_2 net_ssh_2_0_21 trollop_1_16_2 lockfile_1_4_3 mime_types_1_16 gettext_2_1_0 ]; src = fetchurl { - url = "http://gems.rubyforge.org/gems/sup-0.9.1.gem"; - sha256 = "0hifzcvfsbcyjszyyryfi60qiysn0i47f8jlwj3p7v7agxy5hm5a"; + url = "http://gems.rubyforge.org/gems/sup-0.11.gem"; + sha256 = "0dijz1vl1kk4axfnry71bnl2585y1hw0n6sizg9aag7r9m13194q"; }; meta = { homepage = "http://sup.rubyforge.org/"; @@ -566,43 +578,6 @@ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi]."; }; }; - trollop_1_15 = rubyDerivation { - name = "ruby-trollop-1.15"; # full_name - nameNoVersion = "trollop"; - propagatedBuildInputs = [ ]; - src = fetchurl { - url = "http://gems.rubyforge.org/gems/trollop-1.15.gem"; - sha256 = "0xxd96xpnxmm4195qwawpjqgnsbzw4s70jf0wz32ynmya7flgdhk"; - }; - meta = { - homepage = "http://trollop.rubyforge.org"; - license = []; # one of ? - description = "Documentation quickstart: See Trollop::options (for some reason rdoc isn't linking that; it's in the top right of the scr"; # cut to 120 chars - longDescription = "Documentation quickstart: See Trollop::options (for some reason rdoc isn't -linking that; it's in the top right of the screen if you're browsing online) -and then Trollop::Parser#opt. Also see the examples at -http://trollop.rubyforge.org/. - -== DESCRIPTION - -== REQUIREMENTS - -* A burning desire to write less code. - -== INSTALL - -* gem install trollop - -== LICENSE - -Copyright (c) 2008--2009 William Morgan. Trollop is distributed under the same -terms as Ruby. - - -"; - }; - }; - rmail_1_0_0 = rubyDerivation { name = "ruby-rmail-1.0.0"; # full_name nameNoVersion = "rmail"; @@ -621,30 +596,28 @@ terms as Ruby. # aliases rmail=rmail_1_0_0; -term_ansicolor=term_ansicolor_1_0_4; -fastthread=fastthread_1_0_7; -rb_inotify=rb_inotify_0_4_0; -highline=highline_1_5_1; -rubygems_update=rubygems_update_1_3_5; +term_ansicolor=term_ansicolor_1_0_5; +rb_inotify=rb_inotify_0_7_1; +highline=highline_1_5_2; +rubygems_update=rubygems_update_1_3_6; rake=rake_0_8_7; -sup=sup_0_9_1; +sup=sup_0_11; mime_types=mime_types_1_16; -rubyforge=rubyforge_2_0_3; -gemcutter=gemcutter_0_3_0; -ferret=ferret_0_11_6; -json=json_1_2_0; +rubyforge=rubyforge_2_0_4; +gemcutter=gemcutter_0_5_0; +net_ssh=net_ssh_2_0_21; xrefresh_server=xrefresh_server_0_3_0; +xapian_full=xapian_full_1_1_3_4; ncurses=ncurses_0_9_1; -net_ssh=net_ssh_2_0_17; -trollop=trollop_1_15; +json=json_1_2_4; jeweler=jeweler_1_4_0; gettext=gettext_2_1_0; +trollop=trollop_1_16_2; git=git_1_2_5; -json_pure=json_pure_1_2_0; locale=locale_2_0_5; chronic=chronic_0_2_3; +json_pure=json_pure_1_2_4; lockfile=lockfile_1_4_3; -ffi=ffi_0_5_4; - +ffi=ffi_0_6_3; # ================ END automatically generated code ================ }; in libs From d7cba8fc61442b6139e079ee8c6c63ad0d9557d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 12 Apr 2010 19:23:14 +0000 Subject: [PATCH 206/313] Adding rubygems/lib to RUBYLIB in wrapProgram for ruby libs.nix Adding ncursesw, and feeding it to sup for wide character support svn path=/nixpkgs/trunk/; revision=21032 --- pkgs/development/interpreters/ruby/libs.nix | 24 ++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/libs.nix b/pkgs/development/interpreters/ruby/libs.nix index 40be24210fd..b486fc8526f 100644 --- a/pkgs/development/interpreters/ruby/libs.nix +++ b/pkgs/development/interpreters/ruby/libs.nix @@ -33,9 +33,10 @@ let libs = # either the nameNoVersion or name must match patches = { sup = { - buildInputs = [ pkgs.ncurses pkgs.xapianBindings ]; + buildInputs = [ pkgs.ncurses pkgs.xapianBindings libs.ncursesw ]; }; ncurses = { buildInputs = [ pkgs.ncurses ]; }; + ncurses = { buildInputs = [ pkgs.ncurses ]; }; nokogiri = { buildFlags=["--with-xml2-dir=${pkgs.libxml2} --with-xml2-include=${pkgs.libxml2}/include/libxml2" "--with-xslt-dir=${pkgs.libxslt}" ]; @@ -122,7 +123,7 @@ let libs = for prog in $out/bin/*; do wrapProgram "$prog" \ - --prefix RUBYLIB : "$RUBYLIB" \ + --prefix RUBYLIB : "$RUBYLIB":${rubygems}/lib \ --prefix GEM_PATH : "$GEM_PATH" \ --set RUBYOPT 'rubygems' done @@ -154,7 +155,7 @@ let libs = # ================ START automatically generated code ================ # WARNING: automatically generated CODE - # This section has been generated by gem nix sup chronic rubygems-update xrefresh-server rb-inotify jeweler + # This section has been generated by gem nix sup chronic rubygems-update xrefresh-server rb-inotify jeweler ncursesw # the gem nix command has been added by a nix patch to ruby gems json_pure_1_2_4 = rubyDerivation { @@ -594,6 +595,22 @@ minutes of work. }; }; + ncursesw_1_2_4_1 = rubyDerivation { + name = "ruby-ncursesw-1.2.4.1"; # full_name + nameNoVersion = "ncursesw"; + propagatedBuildInputs = [ ]; + src = fetchurl { + url = "http://gems.rubyforge.org/gems/ncursesw-1.2.4.1.gem"; + sha256 = "0cn13h14pk8yds8aklpdcpzl0z6rqifpmaz4lw29g10lgwvfv409"; + }; + meta = { + homepage = "http://ncurses-ruby.berlios.de/"; + license = []; # one of ? + description = "Hacked up version of ncurses gem that supports wide characters and ruby1[...]"; + longDescription = "Hacked up version of ncurses gem that supports wide characters and ruby1.9.1. Original ncurses gem by t-peters@users.berlios.de."; + }; + }; + # aliases rmail=rmail_1_0_0; term_ansicolor=term_ansicolor_1_0_5; @@ -619,5 +636,6 @@ chronic=chronic_0_2_3; json_pure=json_pure_1_2_4; lockfile=lockfile_1_4_3; ffi=ffi_0_6_3; +ncursesw=ncursesw_1_2_4_1; # ================ END automatically generated code ================ }; in libs From 35639242b51aef5bb4a776b8e3c968057e71636f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 12 Apr 2010 21:03:18 +0000 Subject: [PATCH 207/313] I made a typo in ruby libs.nix svn path=/nixpkgs/trunk/; revision=21033 --- pkgs/development/interpreters/ruby/libs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/libs.nix b/pkgs/development/interpreters/ruby/libs.nix index b486fc8526f..7f128c4322c 100644 --- a/pkgs/development/interpreters/ruby/libs.nix +++ b/pkgs/development/interpreters/ruby/libs.nix @@ -36,7 +36,7 @@ let libs = buildInputs = [ pkgs.ncurses pkgs.xapianBindings libs.ncursesw ]; }; ncurses = { buildInputs = [ pkgs.ncurses ]; }; - ncurses = { buildInputs = [ pkgs.ncurses ]; }; + ncursesw = { buildInputs = [ pkgs.ncurses ]; }; nokogiri = { buildFlags=["--with-xml2-dir=${pkgs.libxml2} --with-xml2-include=${pkgs.libxml2}/include/libxml2" "--with-xslt-dir=${pkgs.libxslt}" ]; From b6fe7e6d4109adc1d72aaf7db07ab007f228509e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 12 Apr 2010 21:03:22 +0000 Subject: [PATCH 208/313] Adding offlineimap, in a not very elegant way. svn path=/nixpkgs/trunk/; revision=21034 --- pkgs/tools/networking/offlineimap/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 15 +++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/networking/offlineimap/default.nix diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix new file mode 100644 index 00000000000..fe9225d73fb --- /dev/null +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -0,0 +1,21 @@ +{fetchurl, buildPythonPackage}: + +buildPythonPackage { + name = "offlineimap-6.2.0"; + + src = fetchurl { + url = "http://software.complete.org/software/attachments/download/413/offlineimap_6.2.0.orig.tar.gz"; + sha256 = "057pcz2291mdpkjyrwdzxfg831337sg7bbqyxmwfy42k7np5bdi4"; + }; + + doCheck = false; + + preConfigure = "set -x"; + buildInputs = [ ]; + + meta = { + description = "IMAP to local files bridge"; + homepage = "http://software.complete.org/software/projects/show/offlineimap"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 640134b0687..f0c7797cbd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1225,6 +1225,21 @@ let inherit fetchurl stdenv pkgconfig openobex bluez; }; + offlineimap = import ../tools/networking/offlineimap { + inherit fetchurl; + # I did not find any better way of reusing buildPythonPackage+setuptools + # for a python with openssl support + buildPythonPackage = assert pythonFull.opensslSupport; + import ../development/python-modules/generic { + inherit makeWrapper lib; + python = pythonFull; + setuptools = builderDefsPackage (import ../development/python-modules/setuptools) { + inherit makeWrapper; + python = pythonFull; + }; + }; + }; + opendbx = import ../development/libraries/opendbx { inherit fetchurl stdenv readline mysql postgresql sqlite; }; From 165bc84831d52afa94d9f2883f5eea7795641ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 12 Apr 2010 22:10:15 +0000 Subject: [PATCH 209/313] Adding smtp support to mutt svn path=/nixpkgs/trunk/; revision=21037 --- pkgs/applications/networking/mailreaders/mutt/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 9f8453a6c63..dce79c0f4c7 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -21,7 +21,11 @@ stdenv.mkDerivation { (if sslSupport then openssl else null) ]; configureFlags = [ - "--with-mailpath=" + "--with-mailpath=" "--enable-smtp" + # The next allows building mutt without having anything setgid + # set by the installer, and removing the need for the group 'mail' + # I set the value 'mailbox' because it is a default in the configure script + "--with-homespool=mailbox" (if headerCache then "--enable-hcache" else "--disable-hcache") (if sslSupport then "--with-ssl" else "--without-ssl") (if imapSupport then "--enable-imap" else "--disable-imap") From ec8f2bdc1be06e33ff28440570aa788fc1a0348d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 12 Apr 2010 22:21:01 +0000 Subject: [PATCH 210/313] Adding sasl support to mutt, so ssmtp sending works svn path=/nixpkgs/trunk/; revision=21038 --- pkgs/applications/networking/mailreaders/mutt/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index dce79c0f4c7..86e6873f4b4 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -2,12 +2,15 @@ , sslSupport ? true , imapSupport ? true , headerCache ? true +, saslSupport ? true , gdbm ? null , openssl ? null +, cyrus_sasl ? null }: assert headerCache -> gdbm != null; assert sslSupport -> openssl != null; +assert saslSupport -> cyrus_sasl != null; stdenv.mkDerivation { name = "mutt-1.5.20"; @@ -19,6 +22,7 @@ stdenv.mkDerivation { ncurses which perl (if headerCache then gdbm else null) (if sslSupport then openssl else null) + (if saslSupport then cyrus_sasl else null) ]; configureFlags = [ "--with-mailpath=" "--enable-smtp" @@ -29,6 +33,7 @@ stdenv.mkDerivation { (if headerCache then "--enable-hcache" else "--disable-hcache") (if sslSupport then "--with-ssl" else "--without-ssl") (if imapSupport then "--enable-imap" else "--disable-imap") + (if saslSupport then "--with-sasl" else "--without-imap") ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0c7797cbd5..c29db9220e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7798,7 +7798,7 @@ let }; mutt = import ../applications/networking/mailreaders/mutt { - inherit fetchurl stdenv ncurses which openssl gdbm perl; + inherit fetchurl stdenv ncurses which openssl gdbm perl cyrus_sasl; }; msmtp = import ../applications/networking/msmtp { From a79eba93e22f5071362cc5826eec2f7384f33cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 12 Apr 2010 22:56:13 +0000 Subject: [PATCH 211/313] Updating elinks to a prerelease that has full utf-8 support svn path=/nixpkgs/trunk/; revision=21039 --- pkgs/applications/networking/browsers/elinks/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 9015da07d41..c5b9894a796 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,11 +1,11 @@ args: with args; -stdenv.mkDerivation { - name = "elinks-0.11.3"; +stdenv.mkDerivation rec { + name = "elinks-0.12pre5"; src = fetchurl { - url = http://elinks.or.cz/download/elinks-0.11.3.tar.bz2; - sha256 = "c10e657fbd884eae4f01b91b32407bbfcbcae0ad5017fb24ea365aebc71d2af1"; + url = http://elinks.or.cz/download/elinks-0.12pre5.tar.bz2; + sha256 = "1li4vlbq8wvnigxlkzb15490y90jg6y9yzzrqpqcz2h965w5869d"; }; buildInputs = [python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm]; From d41df5eb06828b3d93d76c2a53bb295ac6e5a371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 12 Apr 2010 23:02:36 +0000 Subject: [PATCH 212/313] Add GNU package update script. svn path=/nixpkgs/trunk/; revision=21040 --- maintainers/scripts/gnu/gnupdate | 4 + maintainers/scripts/gnu/gnupdate.scm | 720 ++++++++++++++ maintainers/scripts/gnu/sxml-match.scm | 1227 ++++++++++++++++++++++++ 3 files changed, 1951 insertions(+) create mode 100755 maintainers/scripts/gnu/gnupdate create mode 100644 maintainers/scripts/gnu/gnupdate.scm create mode 100644 maintainers/scripts/gnu/sxml-match.scm diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate new file mode 100755 index 00000000000..c0dcd078553 --- /dev/null +++ b/maintainers/scripts/gnu/gnupdate @@ -0,0 +1,4 @@ +#!/bin/sh + +exec "${GUILE:-guile}" "$GUILE_FLAGS" -L . -l gnupdate.scm \ + -e '(apply main (cdr (command-line)))' -- "$@" diff --git a/maintainers/scripts/gnu/gnupdate.scm b/maintainers/scripts/gnu/gnupdate.scm new file mode 100644 index 00000000000..e43e5baf32c --- /dev/null +++ b/maintainers/scripts/gnu/gnupdate.scm @@ -0,0 +1,720 @@ +;;; GNUpdate -- Update GNU packages in Nixpkgs. -*- coding: utf-8; -*- +;;; Copyright (C) 2010 Ludovic Courtès +;;; +;;; 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 3 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, see . + +(cond-expand (guile-2 #t) + (else (error "GNU Guile 2.0 is required"))) + +(use-modules (sxml simple) + (ice-9 popen) + (ice-9 match) + (ice-9 rdelim) + (ice-9 regex) + (ice-9 vlist) + (sxml-match) + (srfi srfi-1) + (srfi srfi-9) + (srfi srfi-11) + (srfi srfi-37) + (system foreign) + (rnrs bytevector)) + + +;;; +;;; SNix. +;;; + +(define-record-type + (make-location file line column) + location? + (file location-file) + (line location-line) + (column location-column)) + +(define (->loc line column path) + (and line column path + (make-location path (string->number line) (string->number column)))) + +;; Nix object types visible in the XML output of `nix-instantiate' and +;; mapping to S-expressions (we map to sexps, not records, so that we +;; can do pattern matching): +;; +;; at (at varpat attrspat) +;; attr (attribute loc name value) +;; attrs (attribute-set attributes) +;; attrspat (attribute-set-pattern patterns) +;; bool #f|#t +;; derivation (derivation drv-path out-path attributes) +;; ellipsis '... +;; expr (expr loc body ...) +;; function (function loc at|attrspat|varpat) +;; int int +;; list list +;; null 'null +;; path string +;; string string +;; unevaluated 'unevaluated +;; varpat (varpat name) +;; +;; Initially ATTRIBUTES in `derivation' and `attribute-set' was a promise; +;; however, handling `repeated' nodes makes it impossible to do anything +;; lazily because the whole SXML tree has to be traversed to maintain the +;; list of known derivations. + +(define (sxml->snix tree) + ;; Return the SNix represention of TREE, an SXML tree as returned by + ;; parsing the XML output of `nix-instantiate' on Nixpkgs. + + ;; FIXME: We should use SSAX to avoid the SXML step otherwise we end up + ;; eating memory up to the point where fork(2) returns ENOMEM! + + (define whitespace + ;; The whitespace marker. + (cons 'white 'space)) + + (let loop ((node tree) + (derivations vlist-null)) + (define (process-body body) + (let ((result+derivations + (fold (lambda (node result) + (let-values (((out derivations) + (loop node (cdr result)))) + (if (eq? out whitespace) + result + (cons (cons out (car result)) + derivations)))) + (cons '() derivations) + body))) + (values (reverse (car result+derivations)) + (cdr result+derivations)))) + + (sxml-match node + (,x + (guard (and (string? x) (string=? (string-trim-both x) ""))) + (values whitespace derivations)) + ((*TOP* (*PI* ,_ ...) (expr ,body ...)) + ;; The entry/exit point. Of the two values returned, the second one + ;; is likely to be discarded by the caller (thanks to multiple-value + ;; truncation). + (let-values (((body derivations) (process-body body))) + (values (cons* 'snix #f body) + derivations))) + ((at ,body ...) + (let-values (((body derivations) (process-body body))) + (values (list 'at body) derivations))) + ((attr (@ (name ,name) + (line (,line #f)) (column (,column #f)) (path (,path #f))) + ,body ...) + (let-values (((body derivations) (process-body body))) + (values (cons* 'attribute + (->loc line column path) + name + (if (or (null? body) + (and (pair? body) (null? (cdr body)))) + body + (error 'sxml->snix "invalid attribute body" + body))) + derivations))) + ((attrs ,body ...) + (let-values (((body derivations) (process-body body))) + (values (list 'attribute-set body) + derivations))) + ((attrspat ,body ...) + (let-values (((body derivations) (process-body body))) + (values (cons 'attribute-set-pattern body) + derivations))) + ((bool (@ (value ,value))) + (values (string-ci=? value "true") derivations)) + ((derivation (@ (drvPath ,drv-path) (outPath ,out-path)) ,body ...) + (let-values (((body derivations) (process-body body))) + (let ((repeated? (equal? body '(repeated)))) + (values (list 'derivation drv-path out-path + (if repeated? + (let ((body (vhash-assoc drv-path derivations))) + (if (pair? body) + (cdr body) + (error "no previous occurrence of derivation" + drv-path))) + body)) + (if repeated? + derivations + (vhash-cons drv-path body derivations)))))) + ((ellipsis) + (values '... derivations)) + ((function (@ (line (,line #f)) (column (,column #f)) (path (,path #f))) + ,body ...) + (let-values (((body derivations) (process-body body))) + (values (cons* 'function + (->loc line column path) + (if (and (pair? body) (null? (cdr body))) + body + (error 'sxml->snix "invalid function body" + body))) + derivations))) + ((int (@ (value ,value))) + (values (string->number value) derivations)) + (,x + ;; We can't use `(list ,body ...)', which has a different meaning, + ;; hence the guard hack. + (guard (and (pair? x) (eq? (car x) 'list))) + (process-body (cdr x))) + ((null) + (values 'null derivations)) + ((path (@ (value ,value))) + (values value derivations)) + ((repeated) + ;; This is then handled in `derivation' above. + (values 'repeated derivations)) + ((string (@ (value ,value))) + (values value derivations)) + ((unevaluated) + (values 'unevaluated derivations)) + ((varpat (@ (name ,name))) + (values (list 'varpat name) derivations)) + (,x + (error 'sxml->snix "unmatched sxml form" x))))) + +(define (call-with-package snix proc) + (match snix + (('attribute _ (and attribute-name (? string?)) + ('derivation _ _ body)) + ;; Ugly pattern matching. + (let ((meta + (any (lambda (attr) + (match attr + (('attribute _ "meta" ('attribute-set metas)) metas) + (_ #f))) + body)) + (package-name + (any (lambda (attr) + (match attr + (('attribute _ "name" (and name (? string?))) + name) + (_ #f))) + body)) + (location + (any (lambda (attr) + (match attr + (('attribute loc "name" (? string?)) + loc) + (_ #f))) + body)) + (src + (any (lambda (attr) + (match attr + (('attribute _ "src" src) + src) + (_ #f))) + body))) + (proc attribute-name package-name location meta src))))) + +(define (call-with-src snix proc) + ;; Assume SNIX contains the SNix expression for the value of an `src' + ;; attribute, as returned by `call-with-package', and call PROC with the + ;; relevant SRC information, or #f if SNIX doesn't match. + (match snix + (('derivation _ _ body) + (let ((name + (any (lambda (attr) + (match attr + (('attribute _ "name" (and name (? string?))) + name) + (_ #f))) + body)) + (output-hash + (any (lambda (attr) + (match attr + (('attribute _ "outputHash" (and hash (? string?))) + hash) + (_ #f))) + body)) + (urls + (any (lambda (attr) + (match attr + (('attribute _ "urls" (and urls (? pair?))) + urls) + (_ #f))) + body))) + (proc name output-hash urls))) + (_ (proc #f #f #f)))) + +(define (src->values snix) + (call-with-src snix values)) + +(define (open-nixpkgs nixpkgs) + (let ((script (string-append nixpkgs + "/maintainers/scripts/eval-release.nix"))) + (open-pipe* OPEN_READ "nix-instantiate" + "--strict" "--eval-only" "--xml" + script))) + +(define (nix-prefetch-url url) + ;; Download URL in the Nix store and return the base32-encoded SHA256 hash + ;; of the file at URL + (let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url)) + (hash (read-line pipe))) + (close-pipe pipe) + (if (eof-object? hash) + (values #f #f) + (let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path" + "sha256" hash (basename url))) + (path (read-line pipe))) + (if (eof-object? path) + (values #f #f) + (values (string-trim-both hash) (string-trim-both path))))))) + +(define (update-nix-expression file + old-version old-hash + new-version new-hash) + ;; Modify FILE in-place. Ugly: we call out to sed(1). + (let ((cmd (format #f "sed -i \"~a\" -e 's/~A/~a/g ; s/~A/~A/g'" + file + (regexp-quote old-version) new-version + old-hash + (or new-hash "new hash not available, check the log")))) + (format #t "running `~A'...~%" cmd) + (system cmd))) + + +;;; +;;; FTP client. +;;; + +(define-record-type + (%make-ftp-connection socket addrinfo) + ftp-connection? + (socket ftp-connection-socket) + (addrinfo ftp-connection-addrinfo)) + +(define %ftp-ready-rx + (make-regexp "^([0-9]{3}) (.+)$")) + +(define (%ftp-listen port) + (let loop ((line (read-line port))) + (cond ((eof-object? line) (values line #f)) + ((regexp-exec %ftp-ready-rx line) + => + (lambda (match) + (values (string->number (match:substring match 1)) + (match:substring match 2)))) + (else + (loop (read-line port)))))) + +(define (%ftp-command command expected-code port) + (format port "~A~A~A" command (string #\return) (string #\newline)) + (let-values (((code message) (%ftp-listen port))) + (if (eqv? code expected-code) + message + (throw 'ftp-error port command code message)))) + +(define (ftp-open host) + (catch 'getaddrinfo-error + (lambda () + (let* ((ai (car (getaddrinfo host "ftp"))) + (s (socket (addrinfo:fam ai) (addrinfo:socktype ai) + (addrinfo:protocol ai)))) + (connect s (addrinfo:addr ai)) + (setvbuf s _IOLBF) + (let-values (((code message) (%ftp-listen s))) + (if (eqv? code 220) + (begin + ;(%ftp-command "OPTS UTF8 ON" 200 s) + ;; FIXME: When `USER' returns 331, we should do a `PASS email'. + (%ftp-command "USER anonymous" 230 s) + (%make-ftp-connection s ai)) + (begin + (format (current-error-port) "FTP to `~a' failed: ~A: ~A~%" + host code message) + (close s) + #f))))) + (lambda (key errcode) + (format (current-error-port) "failed to resolve `~a': ~a~%" + host (gai-strerror errcode)) + #f))) + +(define (ftp-close conn) + (close (ftp-connection-socket conn))) + +(define (ftp-chdir conn dir) + (%ftp-command (string-append "CWD " dir) 250 + (ftp-connection-socket conn))) + +(define (ftp-pasv conn) + (define %pasv-rx + (make-regexp "([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+)")) + + (let ((message (%ftp-command "PASV" 227 (ftp-connection-socket conn)))) + (cond ((regexp-exec %pasv-rx message) + => + (lambda (match) + (+ (* (string->number (match:substring match 5)) 256) + (string->number (match:substring match 6))))) + (else + (throw 'ftp-error conn "PASV" 227 message))))) + + +(define (ftp-list conn) + (define (address-with-port sa port) + (let ((fam (sockaddr:fam sa)) + (addr (sockaddr:addr sa))) + (cond ((= fam AF_INET) + (make-socket-address fam addr port)) + ((= fam AF_INET6) + (make-socket-address fam addr port + (sockaddr:flowinfo sa) + (sockaddr:scopeid sa))) + (else #f)))) + + (let* ((port (ftp-pasv conn)) + (ai (ftp-connection-addrinfo conn)) + (s (socket (addrinfo:fam ai) (addrinfo:socktype ai) + (addrinfo:protocol ai)))) + (connect s (address-with-port (addrinfo:addr ai) port)) + (setvbuf s _IOLBF) + + (dynamic-wind + (lambda () #t) + (lambda () + (%ftp-command "LIST" 150 (ftp-connection-socket conn)) + + (let loop ((line (read-line s)) + (result '())) + (cond ((eof-object? line) (reverse result)) + ((regexp-exec %ftp-ready-rx line) + => + (lambda (match) + (let ((code (string->number (match:substring match 1)))) + (if (= 126 code) + (reverse result) + (throw 'ftp-error conn "LIST" code))))) + (else + (loop (read-line s) + (let ((file (car (reverse (string-tokenize line))))) + (cons file result))))))) + (lambda () + (close s) + (let-values (((code message) (%ftp-listen (ftp-connection-socket conn)))) + (or (eqv? code 226) + (throw 'ftp-error conn "LIST" code message))))))) + + +;;; +;;; GNU. +;;; + +(define %ignored-package-attributes + ;; Attribute name of packages to be ignored. + '("bash" "bashReal" "bashInteractive" ;; the full versioned name is incorrect + "autoconf213" + "automake17x" + "automake19x" + "automake110x" + "automake" ;; = 1.10.x + "bison1875" + "bison23" + "bison" ;; = 2.3 + "emacs22" + "emacsSnapshot" + "gcc295" + "gcc33" + "gcc34" + "gcc40" + "gcc41" + "gcc42" + "gcc43" + "glibc25" + "glibc27" + "glibc29" + "guile_1_9" + )) + +(define (gnu? package) + ;; Return true if PACKAGE (a snix expression) is a GNU package (according + ;; to a simple heuristic.) Otherwise return #f. + (match package + (('attribute _ attribute-name ('derivation _ _ body)) + (any (lambda (attr) + (match attr + (('attribute _ "meta" ('attribute-set metas)) + (any (lambda (attr) + (match attr + (('attribute _ "description" value) + (string-prefix? "GNU" value)) + (('attribute "homepage" value) + (string-contains value "www.gnu.org")) + (_ #f))) + metas)) + (_ #f))) + body)) + (_ #f))) + +(define (gnu-packages packages) + (fold (lambda (package gnu) + (match package + (('attribute _ "emacs23Packages" emacs-packages) + ;; XXX: Should prepend `emacs23Packages.' to attribute names. + (append (gnu-packages emacs-packages) gnu)) + (('attribute _ attribute-name ('derivation _ _ body)) + (if (member attribute-name %ignored-package-attributes) + gnu + (if (gnu? package) + (cons package gnu) + gnu))) + (_ gnu))) + '() + packages)) + +(define (ftp-server/directory project) + (define quirks + '(("libgcrypt" "ftp.gnupg.org" "/gcrypt" #t) + ("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t) + ("gnupg" "ftp.gnupg.org" "/gcrypt" #t) + ("gnu-ghostscript" "ftp.gnu.org" "/ghostscript" #f) + ("GNUnet" "ftp.gnu.org" "/gnu/gnunet" #f) + ("icecat" "ftp.gnu.org" "/gnu/gnuzilla" #f) + ("TeXmacs" "ftp.texmacs.org" "/TeXmacs/targz" #f))) + + (let ((quirk (assoc project quirks))) + (match quirk + ((_ server directory subdir?) + (values server (if (not subdir?) + directory + (string-append directory "/" project)))) + (else + (values "ftp.gnu.org" (string-append "/gnu/" project)))))) + +(define (nixpkgs->gnu-name project) + (define quirks + '(("gcc-wrapper" . "gcc") + ("ghostscript" . "gnu-ghostscript") ;; ../ghostscript/gnu-ghoscript-X.Y.tar.gz + ("gnum4" . "m4") + ("gnugrep" . "grep") + ("gnused" . "sed") + ("gnutar" . "tar") + ("gnunet" . "GNUnet") ;; ftp.gnu.org/gnu/gnunet/GNUnet-x.y.tar.gz + ("texmacs" . "TeXmacs"))) + + (or (assoc-ref quirks project) project)) + +(define (releases project) + ;; TODO: Handle project release trees like that of IceCat and MyServer. + (define release-rx + (make-regexp (string-append "^" project "-[0-9].*\\.tar\\."))) + + (catch #t + (lambda () + (let-values (((server directory) (ftp-server/directory project))) + (let ((conn (ftp-open server))) + (ftp-chdir conn directory) + (let ((files (ftp-list conn))) + (ftp-close conn) + (map (lambda (tarball) + (let ((end (string-contains tarball ".tar"))) + (substring tarball 0 end))) + + ;; Filter out signatures, deltas, and files which are potentially + ;; not releases of PROJECT (e.g., in /gnu/guile, filter out + ;; guile-oops and guile-www). + (filter (lambda (file) + (and (not (string-suffix? ".sig" file)) + (regexp-exec release-rx file))) + files)))))) + (lambda (key subr message . args) + (format (current-error-port) + "failed to get release list for `~A': ~A ~A~%" + project message args) + '()))) + +(define version-string>? + (let ((strverscmp + (let ((sym (or (dynamic-func "strverscmp" (dynamic-link)) + (error "could not find `strverscmp' (from GNU libc)")))) + (make-foreign-function int sym (list '* '*)))) + (string->null-terminated-utf8 + (lambda (s) + (let* ((utf8 (string->utf8 s)) + (len (bytevector-length utf8)) + (nts (make-bytevector (+ len 1)))) + (bytevector-copy! utf8 0 nts 0 len) + (bytevector-u8-set! nts len 0) + nts)))) + (lambda (a b) + (let ((a (bytevector->foreign (string->null-terminated-utf8 a))) + (b (bytevector->foreign (string->null-terminated-utf8 b)))) + (> (strverscmp a b) 0))))) + +(define (latest-release project) + ;; Return "FOO-X.Y" or #f. + (let ((releases (releases project))) + (and (not (null? releases)) + (fold (lambda (release latest) + (if (version-string>? release latest) + release + latest)) + "" + releases)))) + +(define (package/version name+version) + (let ((hyphen (string-rindex name+version #\-))) + (if (not hyphen) + (values name+version #f) + (let ((name (substring name+version 0 hyphen)) + (version (substring name+version (+ hyphen 1) + (string-length name+version)))) + (values name version))))) + +(define (file-extension file) + (let ((dot (string-rindex file #\.))) + (and dot (substring file (+ 1 dot) (string-length file))))) + +(define (packages-to-update gnu-packages) + (fold (lambda (pkg result) + (call-with-package pkg + (lambda (attribute name+version location meta src) + (let-values (((name old-version) + (package/version name+version))) + (let ((latest (latest-release (nixpkgs->gnu-name name)))) + (cond ((not latest) + (format #t "~A [unknown latest version]~%" + name+version) + result) + ((string=? name+version latest) + (format #t "~A [up to date]~%" name+version) + result) + (else + (let-values (((project new-version) + (package/version latest)) + ((old-name old-hash old-urls) + (src->values src))) + (format #t "~A -> ~A [~A]~%" name+version latest + (and (pair? old-urls) (car old-urls))) + (let* ((url (and (pair? old-urls) + (car old-urls))) + (new-hash (fetch-gnu project new-version + (if url + (file-extension url) + "gz")))) + (cons (list name attribute + old-version old-hash + new-version new-hash + location) + result)))))))))) + '() + gnu-packages)) + +(define (fetch-gnu project version archive-type) + (let-values (((server directory) + (ftp-server/directory project))) + (let* ((base (string-append project "-" version ".tar." archive-type)) + (url (string-append "ftp://" server "/" directory "/" base)) + (sig (string-append base ".sig")) + (sig-url (string-append url ".sig"))) + (let-values (((hash path) (nix-prefetch-url url))) + (pk 'prefetch-url url hash path) + (and hash path + (begin + (false-if-exception (delete-file sig)) + (system* "wget" sig-url) + (if (file-exists? sig) + (let ((ret (system* "gpg" "--verify" sig path))) + (false-if-exception (delete-file sig)) + (if (and ret (= 0 (status:exit-val ret))) + hash + (begin + (format (current-error-port) + "signature verification failed for `~a'~%" + base) + (format (current-error-port) + "(could be because the public key is not in your keyring)~%") + #f))) + (begin + (format (current-error-port) + "no signature for `~a'~%" base) + hash)))))))) + + +;;; +;;; Main program. +;;; + +(define %options + ;; Specifications of the command-line options. + (list (option '(#\h "help") #f #f + (lambda (opt name arg result) + (format #t "Usage: gnupdate [OPTIONS...]~%") + (format #t "GNUpdate -- update Nix expressions of GNU packages in Nixpkgs~%") + (format #t "~%") + (format #t " -x, --xml=FILE Read XML output of `nix-instantiate'~%") + (format #t " from FILE.~%") + (format #t " -s, --sxml=FILE Read SXML output of `nix-instantiate'~%") + (format #t " from FILE.~%") + (format #t " -h, --help Give this help list.~%~%") + (format #t "Report bugs to ~%") + (exit 0))) + + (option '(#\x "xml") #t #f + (lambda (opt name arg result) + (alist-cons 'xml-file arg result))) + (option '(#\s "sxml") #t #f + (lambda (opt name arg result) + (alist-cons 'sxml-file arg result))))) + +(define (main . args) + ;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs. + (let* ((opts (args-fold args %options + (lambda (opt name arg result) + (error "unrecognized option `~A'" name)) + (lambda (operand result) + (error "extraneous argument `~A'" operand)) + '())) + (home (getenv "HOME")) + (path (or (getenv "NIXPKGS") + (string-append home "/src/nixpkgs"))) + (sxml (or (and=> (assoc-ref opts 'sxml-file) + (lambda (input) + (format (current-error-port) + "reading SXML...~%") + (read-disable 'positions) ;; reduce memory usage + (with-input-from-file input read))) + (begin + (format (current-error-port) "parsing XML...~%") + (xml->sxml + (or (and=> (assoc-ref opts 'xml-file) + open-input-file) + (open-nixpkgs path)))))) + (snix (let ((s (begin + (format (current-error-port) + "producing SNix tree...~%") + (sxml->snix sxml)))) + (set! sxml #f) (gc) + s)) + (packages (match snix + (('snix _ ('attribute-set attributes)) + attributes) + (else #f))) + (gnu (gnu-packages packages)) + (updates (packages-to-update gnu))) + (format #t "~%~A packages to update...~%" (length updates)) + (for-each (lambda (update) + (match update + ((name attribute + old-version old-hash + new-version new-hash + location) + (update-nix-expression (location-file location) + old-version old-hash + new-version new-hash)) + (_ #f))) + updates))) diff --git a/maintainers/scripts/gnu/sxml-match.scm b/maintainers/scripts/gnu/sxml-match.scm new file mode 100644 index 00000000000..48d8c91b4b1 --- /dev/null +++ b/maintainers/scripts/gnu/sxml-match.scm @@ -0,0 +1,1227 @@ +;; Library: sxml-match +;; Author: Jim Bender +;; Version: 1.1, version for PLT Scheme +;; +;; Copyright 2005-9, Jim Bender +;; sxml-match is released under the MIT License +;; + +(define-module (sxml-match) + #:export (sxml-match + sxml-match-let + sxml-match-let*) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11)) + + +;;; +;;; PLT compatibility layer. +;;; + +(define-syntax syntax-object->datum + (syntax-rules () + ((_ stx) + (syntax->datum stx)))) + +(define-syntax void + (syntax-rules () + ((_) *unspecified*))) + +(define-syntax call/ec + ;; aka. `call-with-escape-continuation' + (syntax-rules () + ((_ proc) + (let ((prompt (gensym))) + (call-with-prompt prompt + (lambda () + (proc (lambda args + (apply abort-to-prompt + prompt args)))) + (lambda (k . args) + (apply values args))))))) + +(define-syntax let/ec + (syntax-rules () + ((_ cont body ...) + (call/ec (lambda (cont) body ...))))) + +(define (raise-syntax-error x msg obj sub) + (throw 'sxml-match-error x msg obj sub)) + + +;;; +;;; Body, unmodified from +;;; http://planet.plt-scheme.org/package-source/jim/sxml-match.plt/1/1/sxml-match.ss +;;; except for: +;;; +;;; 1. The PLT-specific `module' form. +;;; +;;; 2. In `sxml-match1', ESCAPE is called with `call-with-values' instead +;;; of being called "normally", such that the example below returns the +;;; values `x' and `y' instead of just `x': +;;; +;;; (sxml-match '(foo) ((bar) (values 'p 'q)) ((foo) (values 'x 'y))) +;;; + +(define (nodeset? x) + (or (and (pair? x) (not (symbol? (car x)))) (null? x))) + +(define (xml-element-tag s) + (if (and (pair? s) (symbol? (car s))) + (car s) + (error 'xml-element-tag "expected an xml-element, given" s))) + +(define (xml-element-attributes s) + (if (and (pair? s) (symbol? (car s))) + (fold-right (lambda (a b) + (if (and (pair? a) (eq? '@ (car a))) + (if (null? b) + (filter (lambda (i) (not (and (pair? i) (eq? '@ (car i))))) (cdr a)) + (fold-right (lambda (c d) + (if (and (pair? c) (eq? '@ (car c))) + d + (cons c d))) + b (cdr a))) + b)) + '() + (cdr s)) + (error 'xml-element-attributes "expected an xml-element, given" s))) + +(define (xml-element-contents s) + (if (and (pair? s) (symbol? (car s))) + (filter (lambda (i) + (not (and (pair? i) (eq? '@ (car i))))) + (cdr s)) + (error 'xml-element-contents "expected an xml-element, given" s))) + +(define (match-xml-attribute key l) + (if (not (pair? l)) + #f + (if (eq? (car (car l)) key) + (car l) + (match-xml-attribute key (cdr l))))) + +(define (filter-attributes keys lst) + (if (null? lst) + '() + (if (member (caar lst) keys) + (filter-attributes keys (cdr lst)) + (cons (car lst) (filter-attributes keys (cdr lst)))))) + +(define-syntax compile-clause + (lambda (stx) + (letrec + ([sxml-match-syntax-error + (lambda (msg exp sub) + (raise-syntax-error #f msg (with-syntax ([s exp]) (syntax (sxml-match s))) sub))] + [ellipsis? + (lambda (stx) + (and (identifier? stx) (eq? '... (syntax->datum stx))))] + [literal? + (lambda (stx) + (let ([x (syntax->datum stx)]) + (or (string? x) + (char? x) + (number? x) + (boolean? x))))] + [keyword? + (lambda (stx) + (and (identifier? stx) + (let ([str (symbol->string (syntax->datum stx))]) + (char=? #\: (string-ref str (- (string-length str) 1))))))] + [extract-cata-fun + (lambda (cf) + (syntax-case cf () + [#f #f] + [other cf]))] + [add-pat-var + (lambda (pvar pvar-lst) + (define (check-pvar lst) + (if (null? lst) + (void) + (if (bound-identifier=? (car lst) pvar) + (sxml-match-syntax-error "duplicate pattern variable not allowed" + stx + pvar) + (check-pvar (cdr lst))))) + (check-pvar pvar-lst) + (cons pvar pvar-lst))] + [add-cata-def + (lambda (depth cvars cfun ctemp cdefs) + (cons (list depth cvars cfun ctemp) cdefs))] + [process-cata-exp + (lambda (depth cfun ctemp) + (if (= depth 0) + (with-syntax ([cf cfun] + [ct ctemp]) + (syntax (cf ct))) + (let ([new-ctemp (car (generate-temporaries (list ctemp)))]) + (with-syntax ([ct ctemp] + [nct new-ctemp] + [body (process-cata-exp (- depth 1) cfun new-ctemp)]) + (syntax (map (lambda (nct) body) ct))))))] + [process-cata-defs + (lambda (cata-defs body) + (if (null? cata-defs) + body + (with-syntax ([(cata-binding ...) + (map (lambda (def) + (with-syntax ([bvar (cadr def)] + [bval (process-cata-exp (car def) + (caddr def) + (cadddr def))]) + (syntax (bvar bval)))) + cata-defs)] + [body-stx body]) + (syntax (let-values (cata-binding ...) + body-stx)))))] + [cata-defs->pvar-lst + (lambda (lst) + (if (null? lst) + '() + (let iter ([items (cadr (car lst))]) + (syntax-case items () + [() (cata-defs->pvar-lst (cdr lst))] + [(fst . rst) (cons (syntax fst) (iter (syntax rst)))]))))] + [process-output-action + (lambda (action dotted-vars) + (define (finite-lst? lst) + (syntax-case lst () + (item + (identifier? (syntax item)) + #f) + (() + #t) + ((fst dots . rst) + (ellipsis? (syntax dots)) + #f) + ((fst . rst) + (finite-lst? (syntax rst))))) + (define (expand-lst lst) + (syntax-case lst () + [() (syntax '())] + [item + (identifier? (syntax item)) + (syntax item)] + [(fst dots . rst) + (ellipsis? (syntax dots)) + (with-syntax ([exp-lft (expand-dotted-item + (process-output-action (syntax fst) + dotted-vars))] + [exp-rgt (expand-lst (syntax rst))]) + (syntax (append exp-lft exp-rgt)))] + [(fst . rst) + (with-syntax ([exp-lft (process-output-action (syntax fst) + dotted-vars)] + [exp-rgt (expand-lst (syntax rst))]) + (syntax (cons exp-lft exp-rgt)))])) + (define (member-var? var lst) + (let iter ([lst lst]) + (if (null? lst) + #f + (if (or (bound-identifier=? var (car lst)) + (free-identifier=? var (car lst))) + #t + (iter (cdr lst)))))) + (define (dotted-var? var) + (member-var? var dotted-vars)) + (define (merge-pvars lst1 lst2) + (if (null? lst1) + lst2 + (if (member-var? (car lst1) lst2) + (merge-pvars (cdr lst1) lst2) + (cons (car lst1) (merge-pvars (cdr lst1) lst2))))) + (define (select-dotted-vars x) + (define (walk-quasi-body y) + (syntax-case y (unquote unquote-splicing) + [((unquote a) . rst) + (merge-pvars (select-dotted-vars (syntax a)) + (walk-quasi-body (syntax rst)))] + [((unquote-splicing a) . rst) + (merge-pvars (select-dotted-vars (syntax a)) + (walk-quasi-body (syntax rst)))] + [(fst . rst) + (merge-pvars (walk-quasi-body (syntax fst)) + (walk-quasi-body (syntax rst)))] + [other + '()])) + (syntax-case x (quote quasiquote) + [(quote . rst) '()] + [(quasiquote . rst) (walk-quasi-body (syntax rst))] + [(fst . rst) + (merge-pvars (select-dotted-vars (syntax fst)) + (select-dotted-vars (syntax rst)))] + [item + (and (identifier? (syntax item)) + (dotted-var? (syntax item))) + (list (syntax item))] + [item '()])) + (define (expand-dotted-item item) + (let ([dvars (select-dotted-vars item)]) + (syntax-case item () + [x + (identifier? (syntax x)) + (syntax x)] + [x (with-syntax ([(dv ...) dvars]) + (syntax (map (lambda (dv ...) x) dv ...)))]))) + (define (expand-quasiquote-body x) + (syntax-case x (unquote unquote-splicing quasiquote) + [(quasiquote . rst) (process-quasiquote x)] + [(unquote item) + (with-syntax ([expanded-item (process-output-action (syntax item) + dotted-vars)]) + (syntax (unquote expanded-item)))] + [(unquote-splicing item) + (with-syntax ([expanded-item (process-output-action (syntax item) + dotted-vars)]) + (syntax (unquote-splicing expanded-item)))] + [((unquote item) dots . rst) + (ellipsis? (syntax dots)) + (with-syntax ([expanded-item (expand-dotted-item + (process-output-action (syntax item) + dotted-vars))] + [expanded-rst (expand-quasiquote-body (syntax rst))]) + (syntax ((unquote-splicing expanded-item) . expanded-rst)))] + [(item dots . rst) + (ellipsis? (syntax dots)) + (with-syntax ([expanded-item (expand-dotted-item + (process-output-action (syntax (quasiquote item)) + dotted-vars))] + [expanded-rst (expand-quasiquote-body (syntax rst))]) + (syntax ((unquote-splicing expanded-item) . expanded-rst)))] + [(fst . rst) + (with-syntax ([expanded-fst (expand-quasiquote-body (syntax fst))] + [expanded-rst (expand-quasiquote-body (syntax rst))]) + (syntax (expanded-fst . expanded-rst)))] + [other x])) + (define (process-quasiquote x) + (syntax-case x () + [(quasiquote term) (with-syntax ([expanded-body (expand-quasiquote-body (syntax term))]) + (syntax (quasiquote expanded-body)))] + [else (sxml-match-syntax-error "bad quasiquote-form" + stx + x)])) + (syntax-case action (quote quasiquote) + [(quote . rst) action] + [(quasiquote . rst) (process-quasiquote action)] + [(fst . rst) (if (finite-lst? action) + (with-syntax ([exp-lft (process-output-action (syntax fst) dotted-vars)] + [exp-rgt (process-output-action (syntax rst) dotted-vars)]) + (syntax (exp-lft . exp-rgt))) + (with-syntax ([exp-lft (process-output-action (syntax fst) + dotted-vars)] + [exp-rgt (expand-lst (syntax rst))]) + (syntax (apply exp-lft exp-rgt))))] + [item action]))] + [compile-element-pat + (lambda (ele exp nextp fail-k pvar-lst depth cata-fun cata-defs dotted-vars) + (syntax-case ele (@) + [(tag (@ . attr-items) . items) + (identifier? (syntax tag)) + (let ([attr-exp (car (generate-temporaries (list exp)))] + [body-exp (car (generate-temporaries (list exp)))]) + (let-values ([(tests new-pvar-lst new-cata-defs new-dotted-vars) + (compile-attr-list (syntax attr-items) + (syntax items) + attr-exp + body-exp + '() + nextp + fail-k + pvar-lst + depth + cata-fun + cata-defs + dotted-vars)]) + (values (with-syntax ([x exp] + [ax attr-exp] + [bx body-exp] + [body tests] + [fail-to fail-k]) + (syntax (if (and (pair? x) (eq? 'tag (xml-element-tag x))) + (let ([ax (xml-element-attributes x)] + [bx (xml-element-contents x)]) + body) + (fail-to)))) + new-pvar-lst + new-cata-defs + new-dotted-vars)))] + [(tag . items) + (identifier? (syntax tag)) + (let ([body-exp (car (generate-temporaries (list exp)))]) + (let-values ([(tests new-pvar-lst new-cata-defs new-dotted-vars) + (compile-item-list (syntax items) + body-exp + nextp + fail-k + #t + pvar-lst + depth + cata-fun + cata-defs + dotted-vars)]) + (values (with-syntax ([x exp] + [bx body-exp] + [body tests] + [fail-to fail-k]) + (syntax (if (and (pair? x) (eq? 'tag (xml-element-tag x))) + (let ([bx (xml-element-contents x)]) + body) + (fail-to)))) + new-pvar-lst + new-cata-defs + new-dotted-vars)))]))] + [compile-end-element + (lambda (exp nextp fail-k pvar-lst cata-defs dotted-vars) + (let-values ([(next-tests new-pvar-lst new-cata-defs new-dotted-vars) + (nextp pvar-lst cata-defs dotted-vars)]) + (values (with-syntax ([x exp] + [body next-tests] + [fail-to fail-k]) + (syntax (if (null? x) body (fail-to)))) + new-pvar-lst + new-cata-defs + new-dotted-vars)))] + [compile-attr-list + (lambda (attr-lst body-lst attr-exp body-exp attr-key-lst nextp fail-k pvar-lst depth cata-fun cata-defs dotted-vars) + (syntax-case attr-lst (unquote ->) + [(unquote var) + (identifier? (syntax var)) + (let-values ([(tests new-pvar-lst new-cata-defs new-dotted-vars) + (compile-item-list body-lst + body-exp + nextp + fail-k + #t + (add-pat-var (syntax var) pvar-lst) + depth + cata-fun + cata-defs + dotted-vars)]) + (values (with-syntax ([ax attr-exp] + [matched-attrs attr-key-lst] + [body tests]) + (syntax (let ([var (filter-attributes 'matched-attrs ax)]) + body))) + new-pvar-lst + new-cata-defs + new-dotted-vars))] + [((atag [(unquote [cata -> cvar ...]) default]) . rst) + (identifier? (syntax atag)) + (let ([ctemp (car (generate-temporaries (syntax ([cvar ...]))))]) + (let-values ([(tests new-pvar-lst new-cata-defs new-dotted-vars) + (compile-attr-list (syntax rst) + body-lst + attr-exp + body-exp + (cons (syntax atag) attr-key-lst) + nextp + fail-k + (add-pat-var ctemp pvar-lst) + depth + cata-fun + (add-cata-def depth + (syntax [cvar ...]) + (syntax cata) + ctemp + cata-defs) + dotted-vars)]) + (values (with-syntax ([ax attr-exp] + [ct ctemp] + [body tests]) + (syntax (let ([binding (match-xml-attribute 'atag ax)]) + (let ([ct (if binding + (cadr binding) + default)]) + body)))) + new-pvar-lst + new-cata-defs + new-dotted-vars)))] + [((atag [(unquote [cvar ...]) default]) . rst) + (identifier? (syntax atag)) + (let ([ctemp (car (generate-temporaries (syntax ([cvar ...]))))]) + (if (not cata-fun) + (sxml-match-syntax-error "sxml-match pattern: catamorphism not allowed in this context" + stx + (syntax [cvar ...]))) + (let-values ([(tests new-pvar-lst new-cata-defs new-dotted-vars) + (compile-attr-list (syntax rst) + body-lst + attr-exp + body-exp + (cons (syntax atag) attr-key-lst) + nextp + fail-k + (add-pat-var ctemp pvar-lst) + depth + cata-fun + (add-cata-def depth + (syntax [cvar ...]) + cata-fun + ctemp + cata-defs) + dotted-vars)]) + (values (with-syntax ([ax attr-exp] + [ct ctemp] + [body tests]) + (syntax (let ([binding (match-xml-attribute 'atag ax)]) + (let ([ct (if binding + (cadr binding) + default)]) + body)))) + new-pvar-lst + new-cata-defs + new-dotted-vars)))] + [((atag [(unquote var) default]) . rst) + (and (identifier? (syntax atag)) (identifier? (syntax var))) + (let-values ([(tests new-pvar-lst new-cata-defs new-dotted-vars) + (compile-attr-list (syntax rst) + body-lst + attr-exp + body-exp + (cons (syntax atag) attr-key-lst) + nextp + fail-k + (add-pat-var (syntax var) pvar-lst) + depth + cata-fun + cata-defs + dotted-vars)]) + (values (with-syntax ([ax attr-exp] + [body tests]) + (syntax (let ([binding (match-xml-attribute 'atag ax)]) + (let ([var (if binding + (cadr binding) + default)]) + body)))) + new-pvar-lst + new-cata-defs + new-dotted-vars))] + [((atag (unquote [cata -> cvar ...])) . rst) + (identifier? (syntax atag)) + (let ([ctemp (car (generate-temporaries (syntax ([cvar ...]))))]) + (let-values ([(tests new-pvar-lst new-cata-defs new-dotted-vars) + (compile-attr-list (syntax rst) + body-lst + attr-exp + body-exp + (cons (syntax atag) attr-key-lst) + nextp + fail-k + (add-pat-var ctemp pvar-lst) + depth + cata-fun + (add-cata-def depth + (syntax [cvar ...]) + (syntax cata) + ctemp + cata-defs) + dotted-vars)]) + (values (with-syntax ([ax attr-exp] + [ct ctemp] + [body tests] + [fail-to fail-k]) + (syntax (let ([binding (match-xml-attribute 'atag ax)]) + (if binding + (let ([ct (cadr binding)]) + body) + (fail-to))))) + new-pvar-lst + new-cata-defs + new-dotted-vars)))] + [((atag (unquote [cvar ...])) . rst) + (identifier? (syntax atag)) + (let ([ctemp (car (generate-temporaries (syntax ([cvar ...]))))]) + (if (not cata-fun) + (sxml-match-syntax-error "sxml-match pattern: catamorphism not allowed in this context" + stx + (syntax [cvar ...]))) + (let-values ([(tests new-pvar-lst new-cata-defs new-dotted-vars) + (compile-attr-list (syntax rst) + body-lst + attr-exp + body-exp + (cons (syntax atag) attr-key-lst) + nextp + fail-k + (add-pat-var ctemp pvar-lst) + depth + cata-fun + (add-cata-def depth + (syntax [cvar ...]) + cata-fun + ctemp + cata-defs) + dotted-vars)]) + (values (with-syntax ([ax attr-exp] + [ct ctemp] + [body tests] + [fail-to fail-k]) + (syntax (let ([binding (match-xml-attribute 'atag ax)]) + (if binding + (let ([ct (cadr binding)]) + body) + (fail-to))))) + new-pvar-lst + new-cata-defs + new-dotted-vars)))] + [((atag (unquote var)) . rst) + (and (identifier? (syntax atag)) (identifier? (syntax var))) + (let-values ([(tests new-pvar-lst new-cata-defs new-dotted-vars) + (compile-attr-list (syntax rst) + body-lst + attr-exp + body-exp + (cons (syntax atag) attr-key-lst) + nextp + fail-k + (add-pat-var (syntax var) pvar-lst) + depth + cata-fun + cata-defs + dotted-vars)]) + (values (with-syntax ([ax attr-exp] + [body tests] + [fail-to fail-k]) + (syntax (let ([binding (match-xml-attribute 'atag ax)]) + (if binding + (let ([var (cadr binding)]) + body) + (fail-to))))) + new-pvar-lst + new-cata-defs + new-dotted-vars))] + [((atag (i ...)) . rst) + (identifier? (syntax atag)) + (sxml-match-syntax-error "bad attribute pattern" + stx + (syntax (kwd (i ...))))] + [((atag i) . rst) + (and (identifier? (syntax atag)) (identifier? (syntax i))) + (sxml-match-syntax-error "bad attribute pattern" + stx + (syntax (kwd i)))] + [((atag literal) . rst) + (and (identifier? (syntax atag)) (literal? (syntax literal))) + (let-values ([(tests new-pvar-lst new-cata-defs new-dotted-vars) + (compile-attr-list (syntax rst) + body-lst + attr-exp + body-exp + (cons (syntax atag) attr-key-lst) + nextp + fail-k + pvar-lst + depth + cata-fun + cata-defs + dotted-vars)]) + (values (with-syntax ([ax attr-exp] + [body tests] + [fail-to fail-k]) + (syntax (let ([binding (match-xml-attribute 'atag ax)]) + (if binding + (if (equal? (cadr binding) literal) + body + (fail-to)) + (fail-to))))) + new-pvar-lst + new-cata-defs + new-dotted-vars))] + [() + (compile-item-list body-lst + body-exp + nextp + fail-k + #t + pvar-lst + depth + cata-fun + cata-defs + dotted-vars)]))] + [compile-item-list + (lambda (lst exp nextp fail-k ellipsis-allowed? pvar-lst depth cata-fun cata-defs dotted-vars) + (syntax-case lst (unquote ->) + [() (compile-end-element exp nextp fail-k pvar-lst cata-defs dotted-vars)] + [(unquote var) + (identifier? (syntax var)) + (if (not ellipsis-allowed?) + (sxml-match-syntax-error "improper list pattern not allowed in this context" + stx + (syntax dots)) + (let-values ([(next-tests new-pvar-lst new-cata-defs new-dotted-vars) + (nextp (add-pat-var (syntax var) pvar-lst) cata-defs dotted-vars)]) + (values (with-syntax ([x exp] + [body next-tests]) + (syntax (let ([var x]) body))) + new-pvar-lst + new-cata-defs + new-dotted-vars)))] + [(unquote [cata -> cvar ...]) + (if (not ellipsis-allowed?) + (sxml-match-syntax-error "improper list pattern not allowed in this context" + stx + (syntax dots)) + (let ([ctemp (car (generate-temporaries (syntax ([cvar ...]))))]) + (let-values ([(next-tests new-pvar-lst new-cata-defs new-dotted-vars) + (nextp (add-pat-var ctemp pvar-lst) + (add-cata-def depth + (syntax [cvar ...]) + (syntax cata) + ctemp + cata-defs) + dotted-vars)]) + (values (with-syntax ([ct ctemp] + [x exp] + [body next-tests]) + (syntax (let ([ct x]) body))) + new-pvar-lst + new-cata-defs + new-dotted-vars))))] + [(unquote [cvar ...]) + (let ([ctemp (car (generate-temporaries (syntax ([cvar ...]))))]) + (if (not cata-fun) + (sxml-match-syntax-error "sxml-match pattern: catamorphism not allowed in this context" + stx + (syntax [cvar ...]))) + (let-values ([(next-tests new-pvar-lst new-cata-defs new-dotted-vars) + (nextp (add-pat-var ctemp pvar-lst) + (add-cata-def depth + (syntax [cvar ...]) + cata-fun + ctemp + cata-defs) + dotted-vars)]) + (values (with-syntax ([ct ctemp] + [x exp] + [body next-tests]) + (syntax (let ([ct x]) body))) + new-pvar-lst + new-cata-defs + new-dotted-vars)))] + [(item dots . rst) + (ellipsis? (syntax dots)) + (if (not ellipsis-allowed?) + (sxml-match-syntax-error "ellipses not allowed in this context" + stx + (syntax dots)) + (compile-dotted-pattern-list (syntax item) + (syntax rst) + exp + nextp + fail-k + pvar-lst + depth + cata-fun + cata-defs + dotted-vars))] + [(item . rst) + (compile-item (syntax item) + exp + (lambda (new-exp new-pvar-lst new-cata-defs new-dotted-vars) + (compile-item-list (syntax rst) + new-exp + nextp + fail-k + ellipsis-allowed? + new-pvar-lst + depth + cata-fun + new-cata-defs + new-dotted-vars)) + fail-k + pvar-lst + depth + cata-fun + cata-defs + dotted-vars)]))] + [compile-dotted-pattern-list + (lambda (item + tail + exp + nextp + fail-k + pvar-lst + depth + cata-fun + cata-defs + dotted-vars) + (let-values ([(tail-tests tail-pvar-lst tail-cata-defs tail-dotted-vars) + (compile-item-list tail + (syntax lst) + (lambda (new-pvar-lst new-cata-defs new-dotted-vars) + (values (with-syntax ([(npv ...) new-pvar-lst]) + (syntax (values #t npv ...))) + new-pvar-lst + new-cata-defs + new-dotted-vars)) + (syntax fail) + #f + '() + depth + '() + '() + dotted-vars)] + [(item-tests item-pvar-lst item-cata-defs item-dotted-vars) + (compile-item item + (syntax lst) + (lambda (new-exp new-pvar-lst new-cata-defs new-dotted-vars) + (values (with-syntax ([(npv ...) new-pvar-lst]) + (syntax (values #t (cdr lst) npv ...))) + new-pvar-lst + new-cata-defs + new-dotted-vars)) + (syntax fail) + '() + (+ 1 depth) + cata-fun + '() + dotted-vars)]) + ; more here: check for duplicate pat-vars, cata-defs + (let-values ([(final-tests final-pvar-lst final-cata-defs final-dotted-vars) + (nextp (append tail-pvar-lst item-pvar-lst pvar-lst) + (append tail-cata-defs item-cata-defs cata-defs) + (append item-pvar-lst + (cata-defs->pvar-lst item-cata-defs) + tail-dotted-vars + dotted-vars))]) + (let ([temp-item-pvar-lst (generate-temporaries item-pvar-lst)]) + (values + (with-syntax + ([x exp] + [fail-to fail-k] + [tail-body tail-tests] + [item-body item-tests] + [final-body final-tests] + [(ipv ...) item-pvar-lst] + [(gpv ...) temp-item-pvar-lst] + [(tpv ...) tail-pvar-lst] + [(item-void ...) (map (lambda (i) (syntax (void))) item-pvar-lst)] + [(tail-void ...) (map (lambda (i) (syntax (void))) tail-pvar-lst)] + [(item-null ...) (map (lambda (i) (syntax '())) item-pvar-lst)] + [(item-cons ...) (map (lambda (a b) + (with-syntax ([xa a] + [xb b]) + (syntax (cons xa xb)))) + item-pvar-lst + temp-item-pvar-lst)]) + (syntax (letrec ([match-tail + (lambda (lst fail) + tail-body)] + [match-item + (lambda (lst) + (let ([fail (lambda () + (values #f + lst + item-void ...))]) + item-body))] + [match-dotted + (lambda (x) + (let-values ([(tail-res tpv ...) + (match-tail x + (lambda () + (values #f + tail-void ...)))]) + (if tail-res + (values item-null ... + tpv ...) + (let-values ([(res new-x ipv ...) (match-item x)]) + (if res + (let-values ([(gpv ... tpv ...) + (match-dotted new-x)]) + (values item-cons ... tpv ...)) + (let-values ([(last-tail-res tpv ...) + (match-tail x fail-to)]) + (values item-null ... tpv ...)))))))]) + (let-values ([(ipv ... tpv ...) + (match-dotted x)]) + final-body)))) + final-pvar-lst + final-cata-defs + final-dotted-vars)))))] + [compile-item + (lambda (item exp nextp fail-k pvar-lst depth cata-fun cata-defs dotted-vars) + (syntax-case item (unquote ->) + ; normal pattern var + [(unquote var) + (identifier? (syntax var)) + (let ([new-exp (car (generate-temporaries (list exp)))]) + (let-values ([(next-tests new-pvar-lst new-cata-defs new-dotted-vars) + (nextp new-exp (add-pat-var (syntax var) pvar-lst) cata-defs dotted-vars)]) + (values (with-syntax ([x exp] + [nx new-exp] + [body next-tests] + [fail-to fail-k]) + (syntax (if (pair? x) + (let ([nx (cdr x)] + [var (car x)]) + body) + (fail-to)))) + new-pvar-lst + new-cata-defs + new-dotted-vars)))] + ; named catamorphism + [(unquote [cata -> cvar ...]) + (let ([new-exp (car (generate-temporaries (list exp)))] + [ctemp (car (generate-temporaries (syntax ([cvar ...]))))]) + (let-values ([(next-tests new-pvar-lst new-cata-defs new-dotted-vars) + (nextp new-exp + (add-pat-var ctemp pvar-lst) + (add-cata-def depth + (syntax [cvar ...]) + (syntax cata) + ctemp + cata-defs) + dotted-vars)]) + (values (with-syntax ([x exp] + [nx new-exp] + [ct ctemp] + [body next-tests] + [fail-to fail-k]) + (syntax (if (pair? x) + (let ([nx (cdr x)] + [ct (car x)]) + body) + (fail-to)))) + new-pvar-lst + new-cata-defs + new-dotted-vars)))] + ; basic catamorphism + [(unquote [cvar ...]) + (let ([new-exp (car (generate-temporaries (list exp)))] + [ctemp (car (generate-temporaries (syntax ([cvar ...]))))]) + (if (not cata-fun) + (sxml-match-syntax-error "sxml-match pattern: catamorphism not allowed in this context" + stx + (syntax [cvar ...]))) + (let-values ([(next-tests new-pvar-lst new-cata-defs new-dotted-vars) + (nextp new-exp + (add-pat-var ctemp pvar-lst) + (add-cata-def depth + (syntax [cvar ...]) + cata-fun + ctemp + cata-defs) + dotted-vars)]) + (values (with-syntax ([x exp] + [nx new-exp] + [ct ctemp] + [body next-tests] + [fail-to fail-k]) + (syntax (if (pair? x) + (let ([nx (cdr x)] + [ct (car x)]) + body) + (fail-to)))) + new-pvar-lst + new-cata-defs + new-dotted-vars)))] + [(tag item ...) + (identifier? (syntax tag)) + (let ([new-exp (car (generate-temporaries (list exp)))]) + (let-values ([(after-tests after-pvar-lst after-cata-defs after-dotted-vars) + (compile-element-pat (syntax (tag item ...)) + (with-syntax ([x exp]) + (syntax (car x))) + (lambda (more-pvar-lst more-cata-defs more-dotted-vars) + (let-values ([(next-tests new-pvar-lst + new-cata-defs + new-dotted-vars) + (nextp new-exp + more-pvar-lst + more-cata-defs + more-dotted-vars)]) + (values (with-syntax ([x exp] + [nx new-exp] + [body next-tests]) + (syntax (let ([nx (cdr x)]) + body))) + new-pvar-lst + new-cata-defs + new-dotted-vars))) + fail-k + pvar-lst + depth + cata-fun + cata-defs + dotted-vars)]) + ; test that we are not at the end of an item-list, BEFORE + ; entering tests for the element pattern (against the 'car' of the item-list) + (values (with-syntax ([x exp] + [body after-tests] + [fail-to fail-k]) + (syntax (if (pair? x) + body + (fail-to)))) + after-pvar-lst + after-cata-defs + after-dotted-vars)))] + [(i ...) + (sxml-match-syntax-error "bad pattern syntax (not an element pattern)" + stx + (syntax (i ...)))] + [i + (identifier? (syntax i)) + (sxml-match-syntax-error "bad pattern syntax (symbol not allowed in this context)" + stx + (syntax i))] + [literal + (literal? (syntax literal)) + (let ([new-exp (car (generate-temporaries (list exp)))]) + (let-values ([(next-tests new-pvar-lst new-cata-defs new-dotted-vars) + (nextp new-exp pvar-lst cata-defs dotted-vars)]) + (values (with-syntax ([x exp] + [nx new-exp] + [body next-tests] + [fail-to fail-k]) + (syntax (if (and (pair? x) (equal? literal (car x))) + (let ([nx (cdr x)]) + body) + (fail-to)))) + new-pvar-lst + new-cata-defs + new-dotted-vars)))]))]) + (let ([fail-k (syntax failure)]) + (syntax-case stx (unquote guard ->) + [(compile-clause ((unquote var) (guard gexp ...) action0 action ...) + exp + cata-fun + fail-exp) + (identifier? (syntax var)) + (syntax (let ([var exp]) + (if (and gexp ...) + (begin action0 action ...) + (fail-exp))))] + [(compile-clause ((unquote [cata -> cvar ...]) (guard gexp ...) action0 action ...) + exp + cata-fun + fail-exp) + (syntax (if (and gexp ...) + (let-values ([(cvar ...) (cata exp)]) + (begin action0 action ...)) + (fail-exp)))] + [(compile-clause ((unquote [cvar ...]) (guard gexp ...) action0 action ...) + exp + cata-fun + fail-exp) + (if (not (extract-cata-fun (syntax cata-fun))) + (sxml-match-syntax-error "sxml-match pattern: catamorphism not allowed in this context" + stx + (syntax [cvar ...])) + (syntax (if (and gexp ...) + (let-values ([(cvar ...) (cata-fun exp)]) + (begin action0 action ...)) + (fail-exp))))] + [(compile-clause ((unquote var) action0 action ...) exp cata-fun fail-exp) + (identifier? (syntax var)) + (syntax (let ([var exp]) + action0 action ...))] + [(compile-clause ((unquote [cata -> cvar ...]) action0 action ...) exp cata-fun fail-exp) + (syntax (let-values ([(cvar ...) (cata exp)]) + action0 action ...))] + [(compile-clause ((unquote [cvar ...]) action0 action ...) exp cata-fun fail-exp) + (if (not (extract-cata-fun (syntax cata-fun))) + (sxml-match-syntax-error "sxml-match pattern: catamorphism not allowed in this context" + stx + (syntax [cvar ...])) + (syntax (let-values ([(cvar ...) (cata-fun exp)]) + action0 action ...)))] + [(compile-clause ((lst . rst) (guard gexp ...) action0 action ...) exp cata-fun fail-exp) + (and (identifier? (syntax lst)) (eq? 'list (syntax->datum (syntax lst)))) + (let-values ([(result pvar-lst cata-defs dotted-vars) + (compile-item-list (syntax rst) + (syntax exp) + (lambda (new-pvar-lst new-cata-defs new-dotted-vars) + (values + (with-syntax + ([exp-body (process-cata-defs new-cata-defs + (process-output-action + (syntax (begin action0 + action ...)) + new-dotted-vars))] + [fail-to fail-k]) + (syntax (if (and gexp ...) exp-body (fail-to)))) + new-pvar-lst + new-cata-defs + new-dotted-vars)) + fail-k + #t + '() + 0 + (extract-cata-fun (syntax cata-fun)) + '() + '())]) + (with-syntax ([fail-to fail-k] + [body result]) + (syntax (let ([fail-to fail-exp]) + (if (nodeset? exp) + body + (fail-to))))))] + [(compile-clause ((lst . rst) action0 action ...) exp cata-fun fail-exp) + (and (identifier? (syntax lst)) (eq? 'list (syntax-object->datum (syntax lst)))) + (let-values ([(result pvar-lst cata-defs dotted-vars) + (compile-item-list (syntax rst) + (syntax exp) + (lambda (new-pvar-lst new-cata-defs new-dotted-vars) + (values (process-cata-defs new-cata-defs + (process-output-action + (syntax (begin action0 + action ...)) + new-dotted-vars)) + new-pvar-lst + new-cata-defs + new-dotted-vars)) + fail-k + #t + '() + 0 + (extract-cata-fun (syntax cata-fun)) + '() + '())]) + (with-syntax ([body result] + [fail-to fail-k]) + (syntax (let ([fail-to fail-exp]) + (if (nodeset? exp) + body + (fail-to))))))] + [(compile-clause ((fst . rst) (guard gexp ...) action0 action ...) exp cata-fun fail-exp) + (identifier? (syntax fst)) + (let-values ([(result pvar-lst cata-defs dotted-vars) + (compile-element-pat (syntax (fst . rst)) + (syntax exp) + (lambda (new-pvar-lst new-cata-defs new-dotted-vars) + (values + (with-syntax + ([body (process-cata-defs new-cata-defs + (process-output-action + (syntax (begin action0 + action ...)) + new-dotted-vars))] + [fail-to fail-k]) + (syntax (if (and gexp ...) body (fail-to)))) + new-pvar-lst + new-cata-defs + new-dotted-vars)) + fail-k + '() + 0 + (extract-cata-fun (syntax cata-fun)) + '() + '())]) + (with-syntax ([fail-to fail-k] + [body result]) + (syntax (let ([fail-to fail-exp]) + body))))] + [(compile-clause ((fst . rst) action0 action ...) exp cata-fun fail-exp) + (identifier? (syntax fst)) + (let-values ([(result pvar-lst cata-defs dotted-vars) + (compile-element-pat (syntax (fst . rst)) + (syntax exp) + (lambda (new-pvar-lst new-cata-defs new-dotted-vars) + (values (process-cata-defs new-cata-defs + (process-output-action + (syntax (begin action0 + action ...)) + new-dotted-vars)) + new-pvar-lst + new-cata-defs + new-dotted-vars)) + fail-k + '() + 0 + (extract-cata-fun (syntax cata-fun)) + '() + '())]) + (with-syntax ([fail-to fail-k] + [body result]) + (syntax (let ([fail-to fail-exp]) + body))))] + [(compile-clause ((i ...) (guard gexp ...) action0 action ...) exp cata-fun fail-exp) + (sxml-match-syntax-error "bad pattern syntax (not an element pattern)" + stx + (syntax (i ...)))] + [(compile-clause ((i ...) action0 action ...) exp cata-fun fail-exp) + (sxml-match-syntax-error "bad pattern syntax (not an element pattern)" + stx + (syntax (i ...)))] + [(compile-clause (pat (guard gexp ...) action0 action ...) exp cata-fun fail-exp) + (identifier? (syntax pat)) + (sxml-match-syntax-error "bad pattern syntax (symbol not allowed in this context)" + stx + (syntax pat))] + [(compile-clause (pat action0 action ...) exp cata-fun fail-exp) + (identifier? (syntax pat)) + (sxml-match-syntax-error "bad pattern syntax (symbol not allowed in this context)" + stx + (syntax pat))] + [(compile-clause (literal (guard gexp ...) action0 action ...) exp cata-fun fail-exp) + (literal? (syntax literal)) + (syntax (if (and (equal? literal exp) (and gexp ...)) + (begin action0 action ...) + (fail-exp)))] + [(compile-clause (literal action0 action ...) exp cata-fun fail-exp) + (literal? (syntax literal)) + (syntax (if (equal? literal exp) + (begin action0 action ...) + (fail-exp)))]))))) + +(define-syntax sxml-match1 + (syntax-rules () + [(sxml-match1 exp cata-fun clause) + (compile-clause clause exp cata-fun + (lambda () (error 'sxml-match "no matching clause found")))] + [(sxml-match1 exp cata-fun clause0 clause ...) + (let/ec escape + (compile-clause clause0 exp cata-fun + (lambda () (call-with-values + (lambda () (sxml-match1 exp cata-fun + clause ...)) + escape))))])) + +(define-syntax sxml-match + (syntax-rules () + ((sxml-match val clause0 clause ...) + (letrec ([cfun (lambda (exp) + (sxml-match1 exp cfun clause0 clause ...))]) + (cfun val))))) + +(define-syntax sxml-match-let1 + (syntax-rules () + [(sxml-match-let1 syntag synform () body0 body ...) + (let () body0 body ...)] + [(sxml-match-let1 syntag synform ([pat exp]) body0 body ...) + (compile-clause (pat (let () body0 body ...)) + exp + #f + (lambda () (error 'syntag "could not match pattern ~s" 'pat)))] + [(sxml-match-let1 syntag synform ([pat0 exp0] [pat exp] ...) body0 body ...) + (compile-clause (pat0 (sxml-match-let1 syntag synform ([pat exp] ...) body0 body ...)) + exp0 + #f + (lambda () (error 'syntag "could not match pattern ~s" 'pat0)))])) + +(define-syntax sxml-match-let-help + (lambda (stx) + (syntax-case stx () + [(sxml-match-let-help syntag synform ([pat exp] ...) body0 body ...) + (with-syntax ([(temp-name ...) (generate-temporaries (syntax (exp ...)))]) + (syntax (let ([temp-name exp] ...) + (sxml-match-let1 syntag synform ([pat temp-name] ...) body0 body ...))))]))) + +(define-syntax sxml-match-let + (lambda (stx) + (syntax-case stx () + [(sxml-match-let ([pat exp] ...) body0 body ...) + (with-syntax ([synform stx]) + (syntax (sxml-match-let-help sxml-match-let synform ([pat exp] ...) body0 body ...)))]))) + +(define-syntax sxml-match-let* + (lambda (stx) + (syntax-case stx () + [(sxml-match-let* () body0 body ...) + (syntax (let () body0 body ...))] + [(sxml-match-let* ([pat0 exp0] [pat exp] ...) body0 body ...) + (with-syntax ([synform stx]) + (syntax (sxml-match-let-help sxml-match-let* synform ([pat0 exp0]) + (sxml-match-let* ([pat exp] ...) + body0 body ...))))]))) From 3653309cb3b6ad14f01de17f6ac9db561378f8d5 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 13 Apr 2010 06:49:34 +0000 Subject: [PATCH 213/313] Match capabilities instead of name Didn't work for ALPS touchpads svn path=/nixpkgs/trunk/; revision=21043 --- pkgs/os-specific/linux/hal/synaptics.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/hal/synaptics.nix b/pkgs/os-specific/linux/hal/synaptics.nix index 882f7613789..20c4d1ec24f 100644 --- a/pkgs/os-specific/linux/hal/synaptics.nix +++ b/pkgs/os-specific/linux/hal/synaptics.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { - + synaptics true event From cafe94f42de92fb0aef44bde0409e17ef478255c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 13 Apr 2010 06:53:51 +0000 Subject: [PATCH 214/313] Add qca openssl plug-in svn path=/nixpkgs/trunk/; revision=21044 --- pkgs/desktops/kde-4.4/default.nix | 5 ++ .../support/qca2/ossl-remove-whirlpool.patch | 74 +++++++++++++++++++ pkgs/desktops/kde-4.4/support/qca2/ossl.nix | 23 ++++++ 3 files changed, 102 insertions(+) create mode 100644 pkgs/desktops/kde-4.4/support/qca2/ossl-remove-whirlpool.patch create mode 100644 pkgs/desktops/kde-4.4/support/qca2/ossl.nix diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index fece15ad111..c6715c9021a 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -33,6 +33,11 @@ pkgs.recurseIntoAttrs (rec { qca2 = import ./support/qca2 { inherit (pkgs) stdenv fetchurl lib which qt4; }; + + qca2_ossl = import ./support/qca2/ossl.nix { + inherit (pkgs) stdenv fetchurl lib qt4 openssl; + inherit qca2; + }; akonadi = import ./support/akonadi { inherit (pkgs) stdenv fetchurl lib cmake qt4 shared_mime_info libxslt boost mysql; diff --git a/pkgs/desktops/kde-4.4/support/qca2/ossl-remove-whirlpool.patch b/pkgs/desktops/kde-4.4/support/qca2/ossl-remove-whirlpool.patch new file mode 100644 index 00000000000..fa4eb401622 --- /dev/null +++ b/pkgs/desktops/kde-4.4/support/qca2/ossl-remove-whirlpool.patch @@ -0,0 +1,74 @@ +Source: Upstream, SVN r864423 +Upstream: Yes +Reason: Fix compilation w/ >=dev-libs/openssl-0.9.8g + + +From 883f1057b31387e7cbfe66f6b3cf5781a6ca49fb Mon Sep 17 00:00:00 2001 +From: infiniti +Date: Wed, 24 Sep 2008 19:22:26 +0000 +Subject: [PATCH] remove whirlpool usage. the algorithm is missing on at least 0.9.8g and + 0.9.8i, even though there's an OBJ_whirlpool definition in 0.9.8i. + +git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca@864423 283d02a7-25f6-0310-bc7c-ecb5cbfe19da +--- + plugins/qca-ossl/qca-ossl.cpp | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/qca-ossl.cpp b/qca-ossl.cpp +index 746a863..f9efd84 100644 +--- a/qca-ossl.cpp ++++ b/qca-ossl.cpp +@@ -6616,9 +6616,11 @@ static QStringList all_hash_types() + #ifdef SHA512_DIGEST_LENGTH + list += "sha512"; + #endif ++/* + #ifdef OBJ_whirlpool + list += "whirlpool"; + #endif ++*/ + return list; + } + +@@ -6863,10 +6865,12 @@ public: + else if ( type == "sha512" ) + return new opensslHashContext( EVP_sha512(), this, type); + #endif ++/* + #ifdef OBJ_whirlpool + else if ( type == "whirlpool" ) + return new opensslHashContext( EVP_whirlpool(), this, type); + #endif ++*/ + else if ( type == "pbkdf1(sha1)" ) + return new opensslPbkdf1Context( EVP_sha1(), this, type ); + else if ( type == "pbkdf1(md2)" ) +-- +1.6.0.4 + + +From 70730a58fe6d9ba5b50b8971424663ba52947e4c Mon Sep 17 00:00:00 2001 +From: infiniti +Date: Wed, 24 Sep 2008 19:23:30 +0000 +Subject: [PATCH] fix warning + +git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca@864425 283d02a7-25f6-0310-bc7c-ecb5cbfe19da +--- + plugins/qca-ossl/qca-ossl.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/qca-ossl.cpp b/qca-ossl.cpp +index f9efd84..1790364 100644 +--- a/qca-ossl.cpp ++++ b/qca-ossl.cpp +@@ -327,7 +327,7 @@ static X509_EXTENSION *new_subject_key_id(X509 *cert) + X509V3_CTX ctx; + X509V3_set_ctx_nodb(&ctx); + X509V3_set_ctx(&ctx, NULL, cert, NULL, NULL, 0); +- X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, "hash"); ++ X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, (char *)"hash"); + return ex; + } + +-- +1.6.0.4 diff --git a/pkgs/desktops/kde-4.4/support/qca2/ossl.nix b/pkgs/desktops/kde-4.4/support/qca2/ossl.nix new file mode 100644 index 00000000000..6385919305d --- /dev/null +++ b/pkgs/desktops/kde-4.4/support/qca2/ossl.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, lib, qt4, qca2, openssl}: + +stdenv.mkDerivation rec { + name = "qca-ossl-2.0.0-beta3"; + src = fetchurl { + url = "http://delta.affinix.com/download/qca/2.0/plugins/${name}.tar.bz2"; + sha256 = "0yy68racvx3clybry2i1bw5bz9yhxr40p3xqagxxb15ihvsrzq08"; + }; + buildInputs = [ qt4 qca2 openssl ]; + dontAddPrefix = true; + configureFlags="--no-separate-debug-info --with-qca=${qca2} + --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib"; + preConfigure='' + configureFlags="$configureFlags --plugins-path=$out/plugins" + ''; + patches = [ ./ossl-remove-whirlpool.patch ]; + meta = { + description = "Qt Cryptographic Architecture OpenSSL plugin"; + license = "LGPL"; + homepage = http://delta.affinix.com/qca; + maintainers = [ lib.maintainers.urkud ]; + }; +} From 61198b7d61e302fcd75b413a7088f3685e87839b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 13 Apr 2010 07:23:55 +0000 Subject: [PATCH 215/313] Typo. Forgotten to remove dashes svn path=/nixpkgs/trunk/; revision=21045 --- pkgs/os-specific/linux/xf86-input-wacom/10-wacom.rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/10-wacom.rules b/pkgs/os-specific/linux/xf86-input-wacom/10-wacom.rules index aa9865ac637..ac7632a776d 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/10-wacom.rules +++ b/pkgs/os-specific/linux/xf86-input-wacom/10-wacom.rules @@ -1,3 +1,3 @@ --# udev rule to create /dev/input/wacomN for wacom tablets -- --KERNEL="event*", SYSFS{manufacturer}="WACOM", NAME="input/%k", SYMLINK="input/wacom%e" +# udev rule to create /dev/input/wacomN for wacom tablets + +KERNEL="event*", SYSFS{manufacturer}="WACOM", NAME="input/%k", SYMLINK="input/wacom%e" From f226c852493e2ee723e280da0438c9abb2650b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 13 Apr 2010 08:56:00 +0000 Subject: [PATCH 216/313] gnupdate: Fix typo. svn path=/nixpkgs/trunk/; revision=21049 --- maintainers/scripts/gnu/gnupdate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index c0dcd078553..741ce7e63ee 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -1,4 +1,4 @@ #!/bin/sh -exec "${GUILE:-guile}" "$GUILE_FLAGS" -L . -l gnupdate.scm \ +exec "${GUILE:-guile}" $GUILE_FLAGS -L . -l gnupdate.scm \ -e '(apply main (cdr (command-line)))' -- "$@" From e56e8ed250c82c14a09c70fa1f631c6811640789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 13 Apr 2010 08:56:04 +0000 Subject: [PATCH 217/313] GNU libtasn1 2.5. svn path=/nixpkgs/trunk/; revision=21050 --- pkgs/development/libraries/libtasn1/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index e259c7b6e43..31ae886d2e4 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libtasn1-2.4"; + name = "libtasn1-2.5"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "03qz9wnx3643wvy10603syx97mi634z6bhdwznzmqcsq6hwg5g69"; + sha256 = "0xr4hsrs7cjx5zy7nkm6a93gkx7dkynyycgk2ayhscf5n5z96pyz"; }; + doCheck = true; + meta = { homepage = http://www.gnu.org/software/libtasn1/; description = "GNU Libtasn1, an ASN.1 library"; From 5ed6e1a1f779fd3fb3f6fd1ed85f08321dcceada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 13 Apr 2010 08:56:07 +0000 Subject: [PATCH 218/313] GNU ddrescue 1.12. svn path=/nixpkgs/trunk/; revision=21051 --- pkgs/tools/system/ddrescue/default.nix | 43 ++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 4ab848ad6e9..3b008ef8889 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,15 +1,46 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ddrescue-1.8"; - + name = "ddrescue-1.12"; + src = fetchurl { - url = "http://ftp.gnu.org/gnu/ddrescue/${name}.tar.bz2"; - sha256 = "080k1s4knh9baw3dxr5vqjjph6dqzkfpk0kpld0a3qc07vsxmhbz"; + url = "mirror://gnu/ddrescue/${name}.tar.gz"; + sha256 = "0ld176lg7dpkv9vcywh3w1cv3iqafq86yi0jwjafls38n65jhnsq"; }; + doCheck = true; + meta = { - description = "GNU ddrescue - advanced dd for corrupted media"; + description = "GNU ddrescue, a data recovery tool"; + + longDescription = + '' GNU ddrescue is a data recovery tool. It copies data from one file + or block device (hard disc, cdrom, etc) to another, trying hard to + rescue data in case of read errors. + + The basic operation of ddrescue is fully automatic. That is, you + don't have to wait for an error, stop the program, read the log, run + it in reverse mode, etc. + + If you use the logfile feature of ddrescue, the data is rescued very + efficiently (only the needed blocks are read). Also you can + interrupt the rescue at any time and resume it later at the same + point. + + Automatic merging of backups: If you have two or more damaged copies + of a file, cdrom, etc, and run ddrescue on all of them, one at a + time, with the same output file, you will probably obtain a complete + and error-free file. This is so because the probability of having + damaged areas at the same places on different input files is very + low. Using the logfile, only the needed blocks are read from the + second and successive copies. + ''; + + homepage = http://www.gnu.org/software/ddrescue/ddrescue.html; + + license = "GPLv3+"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.ludo ]; }; } - From 9170abe84dd2271bc58e045f5a2e5777c1beb04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 13 Apr 2010 08:56:11 +0000 Subject: [PATCH 219/313] GNU cppi 1.15. svn path=/nixpkgs/trunk/; revision=21052 --- pkgs/development/tools/misc/cppi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index 78bcb2226a3..b6c0e9a99b4 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -1,11 +1,11 @@ { fetchurl, xz, stdenv }: stdenv.mkDerivation rec { - name = "cppi-1.14"; + name = "cppi-1.15"; src = fetchurl { url = "mirror://gnu/cppi/${name}.tar.xz"; - sha256 = "0n7388f5z4nnyh17rnj7h0kvml3x2mba6a5km87k2bvm5v4mcrfc"; + sha256 = "1avwwpcwx6rvk9j4id8jq58n5kk756dwnd0wqw4a4p3smvby7gw2"; }; buildInputs = [ xz ]; From 8251c938e8a7346bac253e1b8c9b9e3082820876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 13 Apr 2010 08:56:14 +0000 Subject: [PATCH 220/313] GNU Common C++ 1.8.0. svn path=/nixpkgs/trunk/; revision=21053 --- .../libraries/commoncpp2/default.nix | 40 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/commoncpp2/default.nix b/pkgs/development/libraries/commoncpp2/default.nix index 28ba597e035..8f519a4b43c 100644 --- a/pkgs/development/libraries/commoncpp2/default.nix +++ b/pkgs/development/libraries/commoncpp2/default.nix @@ -1,20 +1,36 @@ -args: with args; -stdenv.mkDerivation { - name = "commoncpp2-2.0.8"; +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "commoncpp2-1.8.0"; src = fetchurl { - url = http://ftp.gnu.org/pub/gnu/commoncpp/ucommon-2.0.8.tar.gz; - sha256 = "09mk70kqwr1pmxa35x0is16g2sa60b3z8p4p5yccw59pp1hpxpq3"; + url = "mirror://gnu/commoncpp/${name}.tar.gz"; + sha256 = "0a7arpm9l3s5qics5m77lyx1yl7998lkypydqwx11nj730034nmc"; }; - buildInputs = []; + doCheck = true; - meta = { - description = "highly portable application framework for threading,sockets, realtime network streaming, persistance, and file access"; + meta = { + description = "GNU Common C++, a portable, highly optimized C++ class framework"; - homepage = http://sourceforge.net/projects/cplusplus/; - license = "LGPL"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + longDescription = + '' GNU Common C++ and GNU uCommon are very portable and highly + optimized class framework for writing C++ applications that need to + use threads and support concurrent sychronization, and that use + sockets, XML parsing, object serialization, thread-optimized String + and data structure classes, etc. This framework offers a class + foundation that hides platform differences from your C++ application + so that you need not write platform specific code. GNU Common C++ + has been ported to compile nativily on most platforms which support + either posix threads, or on maybe be used with Debian hosted mingw32 + to build native threading applications for Microsoft Windows. + ''; + + homepage = http://www.gnu.org/software/commoncpp/; + license = "GPLv2+"; + maintainers = [ stdenv.lib.maintainers.marcweber + stdenv.lib.maintainers.ludo + ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c29db9220e3..b687b1384ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3486,7 +3486,7 @@ let }; commoncpp2 = import ../development/libraries/commoncpp2 { - inherit stdenv fetchurl lib; + inherit stdenv fetchurl; }; consolekit = makeOverridable (import ../development/libraries/consolekit) { From 68369c5475e65fcc9278f016cd4ecc127d6f3828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 13 Apr 2010 08:56:18 +0000 Subject: [PATCH 221/313] GNU ccrtp 1.7.1. svn path=/nixpkgs/trunk/; revision=21054 --- pkgs/development/libraries/ccrtp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index d8b4793dcca..5424e7a73de 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,10 +1,10 @@ args: with args; stdenv.mkDerivation { - name = "ccrtp-1.7.0"; + name = "ccrtp-1.7.1"; src = fetchurl { - url = mirror://gnu/ccrtp/ccrtp-1.7.0.tar.gz; - sha256 = "1bjn5l476nk34gipz4jl2p83m735gzanzr046zrkx423zipx4g4j"; + url = mirror://gnu/ccrtp/ccrtp-1.7.1.tar.gz; + sha256 = "0psi91r0fgawpa5x4jiq7lkr180agdi25gi0mfriqcmykxg7r1jn"; }; buildInputs = [openssl pkgconfig libgcrypt commoncpp2]; From bf775b5cdcd619969c9f12c22a295bb6719535c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Apr 2010 09:55:19 +0000 Subject: [PATCH 222/313] pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.0.5 svn path=/nixpkgs/trunk/; revision=21055 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 52889dbdaab..7e41a1297ea 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { - name = "git-1.7.0.4"; + name = "git-1.7.0.5"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "ff283c3799c3f9719d0512bb23cf8854e1934f1ed36f2058b931d8f1c0b63430"; + sha256 = "96b44fcd8652db8a7a30d87096a17200457d3fbcc91aa334cb7644a6da898d53"; }; patches = [ ./docbook2texi.patch ]; From 689d42ad19d94f899bee9a418dd7c55196dedce0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 Apr 2010 10:00:43 +0000 Subject: [PATCH 223/313] pkgs/applications/version-management/mercurial: updated to version 1.5.1 Patch courtesy of Jean-Marie Gaillourdet. svn path=/nixpkgs/trunk/; revision=21056 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 35c0e6bd767..198d1439514 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,10 +1,10 @@ args: with args; stdenv.mkDerivation rec { - name = "mercurial-1.4.3"; + name = "mercurial-1.5.1"; src = fetchurl { url = "http://www.selenic.com/mercurial/release/${name}.tar.gz"; - sha256 = "091agbxlhansf66ams7n1spwgr3frra0y33dipcqbhx3mjx21j4w"; + sha256 = "5796dd27c884c0effb027c71925fe2c2506b08e0ac8c5f53db259d378ef96569"; }; inherit python; # pass it so that the same version can be used in hg2git From d1c19b4049ef21603b5abbbee208320838a67f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 13 Apr 2010 10:11:42 +0000 Subject: [PATCH 224/313] GNU wget: Fix test suite runs. svn path=/nixpkgs/trunk/; revision=21057 --- pkgs/tools/networking/wget/default.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 1e3171da00b..af15d85af4b 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, perl, gnutls ? null }: +{ stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }: stdenv.mkDerivation rec { name = "wget-1.12"; @@ -15,9 +15,16 @@ stdenv.mkDerivation rec { do sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g' done + + # Work around lack of DNS resolution in chroots. + for i in "tests/"*.pm "tests/"*.px + do + sed -i "$i" -e's/localhost/127.0.0.1/g' + done ''; buildInputs = [ gettext perl ] + ++ stdenv.lib.optional doCheck LWP ++ stdenv.lib.optional (gnutls != null) gnutls; configureFlags = @@ -42,5 +49,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/wget/; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b687b1384ee..70f1ef0e763 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1802,6 +1802,7 @@ let wget = import ../tools/networking/wget { inherit fetchurl stdenv gettext gnutls perl; + inherit (perlPackages) LWP; }; which = import ../tools/system/which { From 75fb2e32dbae2a8b831418f8a9a6c95eeb539734 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Wed, 14 Apr 2010 09:18:45 +0000 Subject: [PATCH 225/313] update to 0.5.1 svn path=/nixpkgs/trunk/; revision=21064 --- pkgs/development/libraries/ffmpeg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index a611a192d81..c67ce169a1c 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, faad2}: stdenv.mkDerivation { - name = "ffmpeg-0.5"; + name = "ffmpeg-0.5.1"; src = fetchurl { - url = http://www.ffmpeg.org/releases/ffmpeg-0.5.tar.bz2; - sha1 = "f930971bc0ac3d11a4ffbb1af439425c24f6f5b1"; + url = http://www.ffmpeg.org/releases/ffmpeg-0.5.1.tar.bz2; + sha256 = "0n68lihyy3jk4q7f22kv6nranfbafyl41hnzpa6cm0r0vf473gn2"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that From fdc760a3f6acc7d51438e2d3b9c37fec650d6a18 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Wed, 14 Apr 2010 09:45:22 +0000 Subject: [PATCH 226/313] add libtheora, speex, vorbis to ffmpeg svn path=/nixpkgs/trunk/; revision=21067 --- pkgs/development/libraries/ffmpeg/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index c67ce169a1c..cdb9bb887e8 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, faad2}: +{stdenv, fetchurl, faad2, libtheora, speex, libvorbis}: stdenv.mkDerivation { name = "ffmpeg-0.5.1"; @@ -19,9 +19,12 @@ stdenv.mkDerivation { --disable-ffplay --enable-libfaad --enable-shared + --enable-libtheora + --enable-libvorbis + --enable-libspeex ''; - buildInputs = [faad2]; + buildInputs = [faad2 libtheora speex libvorbis]; meta = { homepage = http://www.ffmpeg.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70f1ef0e763..8acb5d0ff69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3608,7 +3608,7 @@ let }; ffmpeg = import ../development/libraries/ffmpeg { - inherit fetchurl stdenv faad2; + inherit fetchurl stdenv faad2 libvorbis speex libtheora; }; fftw = import ../development/libraries/fftw { @@ -8007,7 +8007,8 @@ let inherit fetchurl stdenv lib cmake pkgconfig freetype lcms libtiff libxml2 cairo python cups fontconfig zlib libjpeg libpng; inherit (gnome) libart_lgpl; - inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama; + inherit (xlibs) libXau libXaw libXdmcp libXext libX11 libXtst libXi libXinerama libXrender; + inherit (xorg) pixman libpthreadstubs; qt = qt3; }; From 0cf1045be402506420393b3c90e0b7cbe36748ce Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Wed, 14 Apr 2010 10:52:20 +0000 Subject: [PATCH 227/313] update to 1.0.5, add libvorbis, libtheora, speex support svn path=/nixpkgs/trunk/; revision=21068 --- pkgs/applications/video/vlc/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index d46c52b31be..b84ef841efc 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl, perl, xlibs, libdvdnav , zlib, a52dec, libmad, faad2, ffmpeg, alsa , pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf +, libvorbis, libtheora, speex }: stdenv.mkDerivation { - name = "vlc-1.0.4"; + name = "vlc-1.0.5"; src = fetchurl { - url = http://download.videolan.org/pub/videolan/vlc/1.0.4/vlc-1.0.4.tar.bz2; - sha256 = "15lqirz99dcghqdqsqlgb8fa2xs45a7r32zxhlzk5930rnh0pzyv"; + url = http://download.videolan.org/pub/videolan/vlc/1.0.5/vlc-1.0.5.tar.bz2; + sha256 = "1kbd43y6sy6lg1xgl1j4mid6rdx6sszkm8c14hwqrfvgjd69kwgp"; }; buildInputs = [ perl xlibs.xlibs xlibs.libXv zlib a52dec libmad faad2 ffmpeg alsa libdvdnav libdvdnav.libdvdread pkgconfig dbus hal fribidi qt4 + libvorbis libtheora speex ]; - configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad"; + configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad --enable-theora --enable-vorbis --enable-speex"; preBuild = '' substituteInPlace modules/misc/freetype.c --replace \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8acb5d0ff69..16947a62945 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8244,7 +8244,8 @@ let vlc = import ../applications/video/vlc { inherit fetchurl stdenv perl xlibs zlib a52dec libmad faad2 - ffmpeg libdvdnav pkgconfig hal fribidi qt4 freefont_ttf; + ffmpeg libdvdnav pkgconfig hal fribidi qt4 freefont_ttf + libvorbis libtheora speex; dbus = dbus.libs; alsa = alsaLib; }; From 98bab41c33d0ee7cf017db450b05951036277a24 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Apr 2010 10:55:50 +0000 Subject: [PATCH 228/313] * Clean up the "dict" package. For some reason "configureFlags" didn't get passed properly. svn path=/nixpkgs/trunk/; revision=21069 --- pkgs/servers/dict/1.9.15.nix | 22 ---------------------- pkgs/servers/dict/default.nix | 18 ++++++++++++++++++ pkgs/servers/dict/freedict.nix | 4 ---- pkgs/top-level/all-packages.nix | 5 ++--- 4 files changed, 20 insertions(+), 29 deletions(-) delete mode 100644 pkgs/servers/dict/1.9.15.nix create mode 100644 pkgs/servers/dict/default.nix delete mode 100644 pkgs/servers/dict/freedict.nix diff --git a/pkgs/servers/dict/1.9.15.nix b/pkgs/servers/dict/1.9.15.nix deleted file mode 100644 index de9c4f7eeae..00000000000 --- a/pkgs/servers/dict/1.9.15.nix +++ /dev/null @@ -1,22 +0,0 @@ -args : with args; with builderDefs; - let localDefs = builderDefs.passthru.function ((rec { - src = /* put a fetchurl here */ - fetchurl { - url = mirror://sourceforge/dict/dictd-1.9.15.tar.gz; - sha256 = "0p41yf72l0igmshz6vxy3hm51z25600vrnb9j2jpgws4c03fqnac"; - }; - - buildInputs = [flex bison which]; - configureFlags = [ " --datadir=/var/run/current-system/share/dictd " ]; - }) // args); - in with localDefs; -stdenv.mkDerivation rec { - name = "dict-1.9.15"; - builder = writeScript (name + "-builder") - (textClosure localDefs - [doConfigure doMakeInstall doForceShare doPropagate]); - meta = { - description = "Dict protocol server and client"; - inherit src; - }; -} diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix new file mode 100644 index 00000000000..0b78bb9ae94 --- /dev/null +++ b/pkgs/servers/dict/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, which, bison, flex }: + +stdenv.mkDerivation { + name = "dictd-1.9.15"; + + src = fetchurl { + url = mirror://sourceforge/dict/dictd-1.9.15.tar.gz; + sha256 = "0p41yf72l0igmshz6vxy3hm51z25600vrnb9j2jpgws4c03fqnac"; + }; + + buildInputs = [ flex bison which ]; + + configureFlags = "--datadir=/var/run/current-system/share/dictd"; + + meta = { + description = "Dict protocol server and client"; + }; +} diff --git a/pkgs/servers/dict/freedict.nix b/pkgs/servers/dict/freedict.nix deleted file mode 100644 index 2f62525f394..00000000000 --- a/pkgs/servers/dict/freedict.nix +++ /dev/null @@ -1,4 +0,0 @@ - fetchurl { - url = http://downloads.sourceforge.net/freedict/freedict-tools-0.2.tar.bz2; - sha256 = "0hai4rvyrsgagvwq8ahp8iwby77wr62whkkda2pkp8l6fp9sm2gd"; - }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16947a62945..8a9a5a9deb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5439,9 +5439,8 @@ let inherit fetchurl stdenv libtool gettext zlib readline guile python; }; - dict = composedArgsAndFun (import ../servers/dict/1.9.15.nix) { - inherit builderDefs which bison; - flex=flex2534; + dict = makeOverridable (import ../servers/dict) { + inherit fetchurl stdenv which bison flex; }; dictdDBs = recurseIntoAttrs (import ../servers/dict/dictd-db.nix { From cd56e341de3dc15d52ed6e3900ed99628ac7c1c8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Apr 2010 12:13:01 +0000 Subject: [PATCH 229/313] * Consolidate MPlayer trunk.nix and default.nix into one. * Removed the font because MPlayer doesn't use it anymore (it uses fontconfig). * Removed rp9codecs because the Real codecs are included in the "essential" codecs package. * Moved win32codecs into the MPlayer Nix expression. svn path=/nixpkgs/trunk/; revision=21070 --- pkgs/applications/video/MPlayer/default.nix | 69 +++++++--------- .../video/MPlayer/rp9codecs/default.nix | 15 ---- pkgs/applications/video/MPlayer/trunk.nix | 79 ------------------- .../video/MPlayer/win32codecs/default.nix | 19 ----- pkgs/top-level/all-packages.nix | 17 +--- 5 files changed, 32 insertions(+), 167 deletions(-) delete mode 100644 pkgs/applications/video/MPlayer/rp9codecs/default.nix delete mode 100644 pkgs/applications/video/MPlayer/trunk.nix delete mode 100644 pkgs/applications/video/MPlayer/win32codecs/default.nix diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 0c1e9548c8d..6d2de592f42 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -1,10 +1,11 @@ { alsaSupport ? false, xvSupport ? true, theoraSupport ? false, cacaSupport ? false , xineramaSupport ? false, randrSupport ? false, dvdnavSupport ? true -, stdenv, fetchurl, x11, freetype, freefont_ttf, zlib +, stdenv, fetchurl, x11, freetype, fontconfig, zlib , alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null , libXinerama ? null, libXrandr ? null, libdvdnav ? null , cdparanoia ? null, cddaSupport ? true , amrnb ? null, amrwb ? null, amrSupport ? false +, jackaudioSupport ? false, jackaudio ? null , mesa, pkgconfig, unzip }: @@ -16,78 +17,68 @@ assert xineramaSupport -> libXinerama != null; assert randrSupport -> libXrandr != null; assert dvdnavSupport -> libdvdnav != null; assert cddaSupport -> cdparanoia != null; +assert jackaudioSupport -> jackaudio != null; assert amrSupport -> (amrnb != null && amrwb != null); let - win32codecs = (import ./win32codecs) { - inherit stdenv fetchurl; + codecs = stdenv.mkDerivation { + name = "MPlayer-codecs-essential-20071007"; + + src = fetchurl { + url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20071007.tar.bz2; + sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic"; + }; + + installPhase = '' + mkdir $out + cp -prv * $out + ''; + + meta = { + license = "unfree"; + }; }; - rp9codecs = (import ./rp9codecs) { - inherit stdenv fetchurl; - }; - - srcAmr = fetchurl { - url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26073-530.zip; - sha256 = "1qyla52jjymhcnbidhwc6a1vm4v1wl27mj4ygp3cpn33swcmkgd0"; - }; - - srcAmrFloat = fetchurl { - url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-540.zip; - sha256 = "1d337h3051w7azipsq7nzf4d25csia2snq3qlhw2sj7282ab042z"; - }; - - srcAmrWBFloat = fetchurl { - url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26204-540.zip; - sha256 = "1mb7g3fy5faz26jjbibxvlbb5b81vwmdsldl3kl8hzg14vcrv1q9"; - }; - -in +in stdenv.mkDerivation { - name = "MPlayer-1.0rc2-r28450"; + name = "MPlayer-1.0-pre-rc4-20100213"; - # 1.0_rc2 is outdated according to website - use trunk instead src = fetchurl { - url = mirror://gentoo/distfiles/mplayer-1.0_rc2_p28450.tar.bz2; - sha256 = "0cbils58mq20nablywgjfpfx2pzjgnhin23sb8k1s5h2rxgvi3vf"; + url = mirror://gentoo/distfiles/mplayer-1.0_rc4_p20100213.tbz2; + sha256 = "1c5w49vqavs9pnc5av89v502wfa5g7hfn65ffhpx25ddi1irzh2r"; }; buildInputs = - [x11 libXv freetype zlib mesa pkgconfig] + [ x11 libXv freetype zlib mesa pkgconfig ] ++ stdenv.lib.optional alsaSupport alsa ++ stdenv.lib.optional xvSupport libXv ++ stdenv.lib.optional theoraSupport libtheora ++ stdenv.lib.optional cacaSupport libcaca ++ stdenv.lib.optional xineramaSupport libXinerama ++ stdenv.lib.optional randrSupport libXrandr - ++ stdenv.lib.optionals dvdnavSupport [libdvdnav libdvdnav.libdvdread] + ++ stdenv.lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ stdenv.lib.optional cddaSupport cdparanoia - ++ stdenv.lib.optionals amrSupport [amrnb amrwb]; + ++ stdenv.lib.optional jackaudioSupport jackaudio + ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ]; configureFlags = '' ${if cacaSupport then "--enable-caca" else "--disable-caca"} ${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""} - --win32codecsdir=${win32codecs} - --realcodecsdir=${rp9codecs} + --codecsdir=${codecs} --enable-runtime-cpudetection - --enable-x11 --with-extraincdir=${libX11}/include + --enable-x11 --disable-xanim --disable-ivtv ''; NIX_LDFLAGS = "-lX11 -lXext"; - # Provide a reasonable standard font. Maybe we should symlink here. - postInstall = '' - ensureDir $out/share/mplayer - cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf - ''; - meta = { description = "A movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; license = "GPL"; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/applications/video/MPlayer/rp9codecs/default.nix b/pkgs/applications/video/MPlayer/rp9codecs/default.nix deleted file mode 100644 index 4456fc031a7..00000000000 --- a/pkgs/applications/video/MPlayer/rp9codecs/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "MPlayer-rp9codecs-20050115"; - - src = fetchurl { - url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/rp9codecs-20050115.tar.bz2; - sha256 = "353c22e2c992a1c730bdd5fade66a94e1a058e38063d2ce064a6510b70c39677"; - }; - - installPhase = '' - mkdir $out - cp -prv * $out - ''; -} diff --git a/pkgs/applications/video/MPlayer/trunk.nix b/pkgs/applications/video/MPlayer/trunk.nix deleted file mode 100644 index c5676a14167..00000000000 --- a/pkgs/applications/video/MPlayer/trunk.nix +++ /dev/null @@ -1,79 +0,0 @@ -# the hompepage even recommends using trunk -{ alsaSupport ? false, xvSupport ? true, theoraSupport ? false, cacaSupport ? false -, xineramaSupport ? false, randrSupport ? false, dvdnavSupport ? true -, stdenv, fetchurl, x11, freetype, freefont_ttf, zlib -, alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null -, libXinerama ? null, libXrandr ? null, libdvdnav ? null, jackaudio ? null -, cdparanoia ? null, cddaSupport ? true, jackaudioSupport ? true -, mesa, pkgconfig -, sourceFromHead -}: - -assert alsaSupport -> alsa != null; -assert xvSupport -> libXv != null; -assert theoraSupport -> libtheora != null; -assert cacaSupport -> libcaca != null; -assert xineramaSupport -> libXinerama != null; -assert randrSupport -> libXrandr != null; -assert dvdnavSupport -> libdvdnav != null; -assert cddaSupport -> cdparanoia != null; -assert jackaudioSupport -> jackaudio != null; - -let - - win32codecs = (import ./win32codecs) { - inherit stdenv fetchurl; - }; - - rp9codecs = (import ./rp9codecs) { - inherit stdenv fetchurl; - }; - -in - -stdenv.mkDerivation { - - name = "mplayer-trunk"; - - # REGION AUTO UPDATE: { name="MPlayer"; type = "svn"; url="svn://svn.mplayerhq.hu/mplayer/trunk"; } - src = sourceFromHead "MPlayer-30676.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/MPlayer-30676.tar.gz"; sha256 = "3d5fc038d34dfc5af15f1510f06920710d083f61f29fe31f2dfa3cdcac2a4424"; }); - # END - - buildInputs = - [x11 libXv freetype zlib mesa pkgconfig] - ++ stdenv.lib.optional alsaSupport alsa - ++ stdenv.lib.optional xvSupport libXv - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional cacaSupport libcaca - ++ stdenv.lib.optional xineramaSupport libXinerama - ++ stdenv.lib.optional randrSupport libXrandr - ++ stdenv.lib.optionals dvdnavSupport [libdvdnav libdvdnav.libdvdread] - ++ stdenv.lib.optional cddaSupport cdparanoia - ++ stdenv.lib.optional jackaudioSupport jackaudio; - - configureFlags = '' - ${if cacaSupport then "--enable-caca" else "--disable-caca"} - ${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""} - --win32codecsdir=${win32codecs} - --realcodecsdir=${rp9codecs} - --enable-runtime-cpudetection - --enable-x11 - --disable-xanim - --disable-ivtv - ''; - - NIX_LDFLAGS = "-lX11 -lXext"; - - # Provide a reasonable standard font. Maybe we should symlink here. - postInstall = '' - ensureDir $out/share/mplayer - cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf - ''; - - meta = { - description = "A movie player that supports many video formats"; - homepage = "http://mplayerhq.hu"; - license = "GPL"; - }; -} diff --git a/pkgs/applications/video/MPlayer/win32codecs/default.nix b/pkgs/applications/video/MPlayer/win32codecs/default.nix deleted file mode 100644 index 569b6780374..00000000000 --- a/pkgs/applications/video/MPlayer/win32codecs/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "MPlayer-codecs-essential-20071007"; - - src = fetchurl { - url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20071007.tar.bz2; - sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic"; - }; - - installPhase = '' - mkdir $out - cp -prv * $out - ''; - - meta = { - license = "unfree"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a9a5a9deb6..24f8c7a2aff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7752,8 +7752,8 @@ let }; MPlayer = import ../applications/video/MPlayer { - inherit fetchurl stdenv freetype x11 zlib libtheora libcaca freefont_ttf libdvdnav - cdparanoia mesa pkgconfig unzip amrnb amrwb; + inherit fetchurl stdenv freetype fontconfig x11 zlib libtheora libcaca libdvdnav + cdparanoia mesa pkgconfig unzip amrnb amrwb jackaudio; inherit (xlibs) libX11 libXv libXinerama libXrandr; alsaSupport = true; alsa = alsaLib; @@ -7773,19 +7773,6 @@ let # !!! should depend on MPlayer }; - MPlayerTrunk = import ../applications/video/MPlayer/trunk.nix { - inherit fetchurl sourceFromHead stdenv freetype x11 zlib libtheora libcaca - freefont_ttf libdvdnav cdparanoia mesa pkgconfig jackaudio; - inherit (xlibs) libX11 libXv libXinerama libXrandr; - alsaSupport = true; - alsa = alsaLib; - theoraSupport = true; - cacaSupport = true; - xineramaSupport = true; - randrSupport = true; - cddaSupport = true; - }; - mrxvt = import ../applications/misc/mrxvt { inherit lib fetchurl stdenv freetype pkgconfig which; inherit (xlibs) libXaw xproto libXt libX11 libSM libICE libXft From 295af6ab173534e65c53fb4d2e4afff2fc8476c7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Apr 2010 19:26:31 +0000 Subject: [PATCH 230/313] Ignore fake collisions svn path=/nixpkgs/trunk/; revision=21075 --- pkgs/build-support/buildenv/builder.pl | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 37eb21887fd..856eca7b80b 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -1,7 +1,7 @@ #! @perl@ -w use strict; -use Cwd; +use Cwd 'abs_path'; use IO::Handle; use File::Path; use File::Basename; @@ -96,9 +96,17 @@ sub createLinks { } elsif (-l $dstFile) { - if (!$ignoreCollisions) { - my $target = readlink $dstFile; - die "collission between `$srcFile' and `$target'"; + my $oldTarget = readlink $dstFile; + my $oldTargetReal = abs_path $oldTarget; + my $newTarget = $srcFile; + my $newTargetReal = abs_path $newTarget; + unless ($newTargetReal eq $oldTargetReal) { + if ($ignoreCollisions) { + warn "collision between `$newTarget' and `$oldTarget'\n"; + } + else { + die "collision between `$newTarget' and `$oldTarget'"; + } } } @@ -114,7 +122,7 @@ my %done; my %postponed; sub addPkg; -sub addPkg { +sub addPkg($;$) { my $pkgDir = shift; my $ignoreCollisions = shift; @@ -131,6 +139,7 @@ sub addPkg { close PROP; my @propagated = split ' ', $propagated; foreach my $p (@propagated) { + print "$pkgDir propagates $p\n"; $postponed{$p} = 1 unless defined $done{$p}; } } From 99e825a42c261ae59b8c281b4a6dd9690ad52244 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Apr 2010 19:26:50 +0000 Subject: [PATCH 231/313] Build MIME database from all available packages svn path=/nixpkgs/trunk/; revision=21076 --- pkgs/build-support/buildenv/builder.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 856eca7b80b..bb9e45b62ac 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -59,6 +59,7 @@ sub createLinks { $srcFile =~ /\/nix-support$/ || $srcFile =~ /\/perllocal.pod$/ || $srcFile =~ /\/info\/dir$/ || + ( $relName2 =~ /^\/share\/mime\// && !( $relName2 =~ /^\/share\/mime\/packages/ ) ) || $srcFile =~ /\/log$/) { # Do nothing. @@ -166,6 +167,11 @@ while (scalar(keys %postponed) > 0) { } } +if (-x "$out/bin/update-mime-database" && -d "$out/share/mime/packages") { + system("$out/bin/update-mime-database -V $out/share/mime") == 0 + or die "Can't update mime-database"; +} + print STDERR "created $symlinks symlinks in user environment\n"; From 1336665f0df4f5aa3e340b1db75442689d8df3f3 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Apr 2010 19:27:04 +0000 Subject: [PATCH 232/313] Typo in path, style svn path=/nixpkgs/trunk/; revision=21077 --- .../drivers/{cups-bnjp => cups-bjnp}/default.nix | 13 ++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) rename pkgs/misc/cups/drivers/{cups-bnjp => cups-bjnp}/default.nix (50%) diff --git a/pkgs/misc/cups/drivers/cups-bnjp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix similarity index 50% rename from pkgs/misc/cups/drivers/cups-bnjp/default.nix rename to pkgs/misc/cups/drivers/cups-bjnp/default.nix index 3f2cb4474f4..f752ac84a84 100644 --- a/pkgs/misc/cups/drivers/cups-bnjp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -1,9 +1,10 @@ -args: with args; -stdenv.mkDerivation { - name = "cups-bjnp"; +{stdenv, fetchurl, cups}: + +stdenv.mkDerivation rec { + name = "cups-bjnp-0.5.4"; src = fetchurl { - url = mirror://sourceforge/project/cups-bjnp/cups-bjnp/0.5.4/cups-bjnp-0.5.4.tar.gz; + url = "mirror://sourceforge/cups-bjnp/${name}.tar.gz"; sha256 = "1q5npis0jgs44yvczrr6pz87glk1d9lv3vr2s4nqrk3l0q4xplf6"; }; @@ -11,5 +12,7 @@ stdenv.mkDerivation { buildInputs = [cups]; - meta = { }; + meta = { + homepage = http://cups-bjnp.sourceforge.net; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24f8c7a2aff..12368ff8fb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8958,7 +8958,7 @@ let inherit fetchurl stdenv rpm cpio zlib; }; - cupsBjnp = import ../misc/cups/drivers/cups-bnjp { + cupsBjnp = import ../misc/cups/drivers/cups-bjnp { inherit fetchurl stdenv cups; }; From 0ab619066b3440d1510798ee9ab03035ad0d0d08 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Apr 2010 19:27:15 +0000 Subject: [PATCH 233/313] Add splix cups driver svn path=/nixpkgs/trunk/; revision=21078 --- pkgs/misc/cups/drivers/splix/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/misc/cups/drivers/splix/default.nix diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix new file mode 100644 index 00000000000..02970073b11 --- /dev/null +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, cups, zlib}: + +stdenv.mkDerivation rec { + name = "splix-2.0.0"; + + src = fetchurl { + url = "mirror://sourceforge/splix/${name}.tar.bz2"; + sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp"; + }; + + preBuild='' + makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model" + ''; + + buildInputs = [cups zlib]; + + meta = { + homepage = http://splix.sourceforge.net; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12368ff8fb9..f6b79a36696 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9164,6 +9164,10 @@ let hasktags = haskellPackages.myhasktags; }; + splix = import ../misc/cups/drivers/splix { + inherit stdenv fetchurl cups zlib; + }; + synaptics = import ../misc/synaptics { inherit fetchurl stdenv pkgconfig; inherit (xlibs) libX11 libXi libXext pixman xf86inputevdev; From 49a3e1e46bcb1c512905a79c5d942c5a5e0b27f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 15 Apr 2010 06:08:37 +0000 Subject: [PATCH 234/313] Added AspectAG for Haskell. svn path=/nixpkgs/trunk/; revision=21083 --- .../libraries/haskell/AspectAG/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/AspectAG/default.nix diff --git a/pkgs/development/libraries/haskell/AspectAG/default.nix b/pkgs/development/libraries/haskell/AspectAG/default.nix new file mode 100644 index 00000000000..c9ede897ca0 --- /dev/null +++ b/pkgs/development/libraries/haskell/AspectAG/default.nix @@ -0,0 +1,14 @@ +{cabal, HList, mtl}: + +cabal.mkDerivation (self : { + pname = "AspectAG"; + version = "0.1.5"; + sha256 = "4cefc7e3404a723f0a75b29797bd9fe685c2a1b3150826b3ba09ade94565f6ff"; + propagatedBuildInputs = [HList mtl]; + meta = { + description = "Attribute Grammars in the form of an EDSL"; + license = "LGPL"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6a35af88fae..45474d3ae5b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -41,6 +41,10 @@ rec { inherit cabal ansiTerminal; }; + AspectAG = import ../development/libraries/haskell/AspectAG { + inherit cabal HList mtl; + }; + benchpress = import ../development/libraries/haskell/benchpress { inherit cabal; }; From c1e12f27887450ea2473ad446352ca2d5a933d0a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 15 Apr 2010 08:44:54 +0000 Subject: [PATCH 235/313] Temporary other OO.o mirror just to get the build working for now svn path=/nixpkgs/trunk/; revision=21084 --- pkgs/applications/office/openoffice/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index 3edd4e5b3f8..9af41d19a30 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { name = "openoffice.org-${version}"; builder = ./builder.sh; - downloadRoot = "http://download.services.openoffice.org/files/stable"; + #downloadRoot = "http://download.services.openoffice.org/files/stable"; + downloadRoot = "http://www-openoffice.com/source/"; src = fetchurl { url = "${downloadRoot}/${version}/OOo_${version}_src_core.tar.bz2"; From 554f09f582089103761d5b10d52586e3b4b97109 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 15 Apr 2010 11:15:08 +0000 Subject: [PATCH 236/313] Retrieve all hashes fom SVN history - forgot to specify them svn path=/nixpkgs/trunk/; revision=21089 --- pkgs/applications/office/openoffice/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index 9af41d19a30..e7711eb226e 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -13,17 +13,18 @@ stdenv.mkDerivation rec { #downloadRoot = "http://download.services.openoffice.org/files/stable"; downloadRoot = "http://www-openoffice.com/source/"; + versionDirs = false; src = fetchurl { - url = "${downloadRoot}/${version}/OOo_${version}_src_core.tar.bz2"; - sha256 = "b44ab94c75b89c9354531ddba9c211374567535e147308a934e8c35d7b26814a"; + url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2"; + sha256 = "95440f09f8dce616178b86b26af8e543c869d01579207aa68e8474019b59caca"; }; patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ]; src_system = fetchurl { url = "${downloadRoot}/${version}/OOo_${version}_src_system.tar.bz2"; - sha256 = "97796333eb2f17e8199026d4ab4334d59bbbffc8d2f9d9100a0c27e823e1305a"; + sha256 = "bb4a440ca91a40cd2b5692abbc19e8fbd3d311525edb266dc5cd9ebc324f2b4a"; }; configureFlags = " From 8840dd10feeca0e8fcf2ed81c0f6a42f14604cee Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 15 Apr 2010 11:32:38 +0000 Subject: [PATCH 237/313] Fix the second URL svn path=/nixpkgs/trunk/; revision=21090 --- pkgs/applications/office/openoffice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index e7711eb226e..2916a48efbf 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ]; src_system = fetchurl { - url = "${downloadRoot}/${version}/OOo_${version}_src_system.tar.bz2"; + url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_system.tar.bz2"; sha256 = "bb4a440ca91a40cd2b5692abbc19e8fbd3d311525edb266dc5cd9ebc324f2b4a"; }; From 5d94294dd51b1d71465b1bb71dff0369f5a6cc0d Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Thu, 15 Apr 2010 12:08:08 +0000 Subject: [PATCH 238/313] pkgs/os-specific/linux/blcr: update to version 0.8.2 svn path=/nixpkgs/trunk/; revision=21091 --- pkgs/os-specific/linux/blcr/0.8.2.nix | 50 + pkgs/os-specific/linux/blcr/fixes.patch | 112371 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 112425 insertions(+) create mode 100644 pkgs/os-specific/linux/blcr/0.8.2.nix create mode 100644 pkgs/os-specific/linux/blcr/fixes.patch diff --git a/pkgs/os-specific/linux/blcr/0.8.2.nix b/pkgs/os-specific/linux/blcr/0.8.2.nix new file mode 100644 index 00000000000..3217f9aec3a --- /dev/null +++ b/pkgs/os-specific/linux/blcr/0.8.2.nix @@ -0,0 +1,50 @@ +{stdenv, fetchurl, kernel, perl, makeWrapper}: + +assert stdenv.isLinux; + +let + version = "0.8.2"; + website = https://ftg.lbl.gov/CheckpointRestart; +in + +stdenv.mkDerivation { + name = "blcr-${version}-${kernel.version}"; + + src = fetchurl { + url = "${website}/downloads/blcr-${version}.tar.gz"; + sha256 = "1ldvzrajljkm318z5ix1p27n0gmv7gqxij6ck7p5fz4ncdbb01x8"; + }; + + patches = [ ./fixes.patch ]; + + buildInputs = [ perl makeWrapper ]; + + # this gives "configure: error: unrecognized option: `-d'" + /* + configureFlags = [ + "--with-linux=$(ls -d ${kernel}/lib/modules/ * /build)" + "--with-kmod-dir=$out/lib/modules/$(cd ${kernel}/lib/modules; ls -d 2.6.*)" + "--with-system-map=${kernel}/System.map" + ]; + */ + + configurePhase = '' + ./configure --prefix=$out \ + --with-linux=$(ls -d ${kernel}/lib/modules/*/build) \ + --with-kmod-dir=$out/lib/modules/$(cd ${kernel}/lib/modules; ls -d 2.6.*) \ + --with-system-map=${kernel}/System.map + ''; + + postInstall = '' + for prog in "$out/bin/"* + do + wrapProgram "$prog" --prefix LD_LIBRARY_PATH ":" "$out/lib" + done + ''; + + meta = { + description = "Berkeley Lab Checkpoint/Restart for Linux (BLCR)"; + homepage = website; + license = "GPL2"; + }; +} diff --git a/pkgs/os-specific/linux/blcr/fixes.patch b/pkgs/os-specific/linux/blcr/fixes.patch new file mode 100644 index 00000000000..c7207aec896 --- /dev/null +++ b/pkgs/os-specific/linux/blcr/fixes.patch @@ -0,0 +1,112371 @@ +diff -r 3c8a74e0c599 Makefile.in +--- a/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -13,15 +14,12 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = . ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -33,7 +31,9 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++subdir = . + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/blcr_config.h.in \ + $(top_srcdir)/blcr_imports/kbuild/Makefile.in \ +@@ -42,106 +42,92 @@ + ./config/config.guess ./config/config.sub ./config/depcomp \ + ./config/install-sh ./config/ltmain.sh ./config/missing \ + COPYING COPYING.LIB NEWS +-subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +- configure.lineno configure.status.lineno +-mkinstalldirs = $(mkdir_p) ++ configure.lineno config.status.lineno ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = blcr_config.h + CONFIG_CLEAN_FILES = cr_module/kbuild/Makefile \ + blcr_imports/kbuild/Makefile config/kbuild.mak ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir dist dist-all distcheck + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) + am__remove_distdir = \ +- { test ! -d $(distdir) \ +- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr $(distdir); }; } ++ { test ! -d "$(distdir)" \ ++ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr "$(distdir)"; }; } ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" + DIST_ARCHIVES = $(distdir).tar.gz + GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print + distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -162,20 +148,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -183,12 +169,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -204,70 +189,91 @@ + + # Our rpm specfile wants to query some vars + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + + ### + # Optional directories +@@ -336,19 +342,19 @@ + .SUFFIXES: + am--refresh: + @: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ +- cd $(srcdir) && $(AUTOMAKE) --foreign \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ ++ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -363,22 +369,23 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(srcdir) && $(AUTOCONF) +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ $(am__cd) $(srcdir) && $(AUTOCONF) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++$(am__aclocal_m4_deps): + + blcr_config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ +- $(MAKE) stamp-h1; \ ++ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + else :; fi + + stamp-h1: $(srcdir)/blcr_config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status blcr_config.h +-$(srcdir)/blcr_config.h.in: $(am__configure_deps) +- cd $(top_srcdir) && $(AUTOHEADER) ++$(srcdir)/blcr_config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f stamp-h1 + touch $@ + +@@ -398,8 +405,7 @@ + -rm -rf .libs _libs + + distclean-libtool: +- -rm -f libtool +-uninstall-info-am: ++ -rm -f libtool config.lt + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -408,7 +414,13 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @fail= failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -419,16 +431,21 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @fail= failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -448,16 +465,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -465,97 +482,122 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) blcr_config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ test ! -f $$subdir/TAGS || \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) blcr_config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) blcr_config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) blcr_config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) + $(am__remove_distdir) +- mkdir $(distdir) +- $(mkdir_p) $(distdir)/blcr_imports $(distdir)/blcr_imports/kbuild $(distdir)/config $(distdir)/contrib $(distdir)/cr_module/kbuild $(distdir)/include $(distdir)/rpm $(distdir)/tests +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ test -d "$(distdir)" || mkdir "$(distdir)" ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || mkdir "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- (cd $$subdir && \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="../$(top_distdir)" \ +- distdir="../$(distdir)/$$subdir" \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -563,21 +605,31 @@ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook +- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ -test -n "$(am__skip_mode_fix)" \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ +- || chmod -R a+r $(distdir) ++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ ++ || chmod -R a+r "$(distdir)" + dist-gzip: distdir +- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + + dist-bzip2: distdir +- $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 ++ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 ++ $(am__remove_distdir) ++ ++dist-lzma: distdir ++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma ++ $(am__remove_distdir) ++ ++dist-xz: distdir ++ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + $(am__remove_distdir) + + dist-tarZ: distdir +- $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z ++ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + + dist-shar: distdir +@@ -590,7 +642,7 @@ + $(am__remove_distdir) + + dist dist-all: distdir +- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + + # This target untars the dist file and tries a VPATH configuration. Then +@@ -599,13 +651,17 @@ + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ ++ *.tar.lzma*) \ ++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ ++ *.tar.xz*) \ ++ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\ ++ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +@@ -613,9 +669,11 @@ + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) ++ test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && cd $(distdir)/_build \ ++ && am__cwd=`pwd` \ ++ && $(am__cd) $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ +@@ -637,13 +695,15 @@ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ +- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ ++ && cd "$$am__cwd" \ ++ || exit 1 + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ +- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' ++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + distuninstallcheck: +- @cd $(distuninstallcheck_dir) \ ++ @$(am__cd) '$(distuninstallcheck_dir)' \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ +@@ -685,7 +745,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -707,18 +768,38 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: + + install-data-am: install-data-local + ++install-dvi: install-dvi-recursive ++ ++install-dvi-am: ++ + install-exec-am: install-exec-local + ++install-html: install-html-recursive ++ ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-pdf-am: ++ ++install-ps: install-ps-recursive ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -739,26 +820,28 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \ ++ ctags-recursive install-am install-strip tags-recursive + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \ +- am--refresh check check-am check-local clean clean-generic \ +- clean-libtool clean-local clean-recursive ctags \ +- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ +- dist-tarZ dist-zip distcheck distclean distclean-generic \ +- distclean-hdr distclean-libtool distclean-local \ +- distclean-recursive distclean-tags distcleancheck distdir \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am all-local am--refresh check check-am check-local \ ++ clean clean-generic clean-libtool clean-local ctags \ ++ ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ ++ dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ ++ distclean distclean-generic distclean-hdr distclean-libtool \ ++ distclean-local distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ +- install-data-local install-exec install-exec-am \ +- install-exec-local install-info install-info-am install-man \ ++ install-data-local install-dvi install-dvi-am install-exec \ ++ install-exec-am install-exec-local install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am uninstall-info-am \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-local + + +@@ -863,6 +946,7 @@ + @echo $($(VARNAME)) | sed 's/"/\\"/'g + + .PHONY: dist-srpm dist-oscar rpms examples util libcr tests bonus-check echoval $(module_phony) ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 acinclude.m4 +--- a/acinclude.m4 Sun Apr 11 12:41:30 2010 +0200 ++++ b/acinclude.m4 Sun Apr 11 16:31:36 2010 +0200 +@@ -953,8 +953,9 @@ + # When complete sets LINUX_SYMTAB_CMD such that + # "eval $LINUX_SYMTAB_CMD" will produce a System.map on stdout. + cr_stripped_maps='' ++m4_define([cr_ksymtab_patt],[[-e '[TD] sys_open' -e '[AB] _end']]) + AC_DEFUN([_CR_CHECK_SYSTEM_MAP],[ +- if test -n "$1" -a -r "$1" && grep ' [[AB]] _end' <"$1" >/dev/null 2>/dev/null; then ++ if test -n "$1" -a -r "$1" && grep cr_ksymtab_patt <"$1" >/dev/null 2>/dev/null; then + if grep -B1 '[[AB]] _end' <"$1" | grep _stext >/dev/null 2>/dev/null; then + # Reject "stripped" files (such as in FC2) + # Recognized (poorly) by _stext and _end as last two entries. +@@ -968,7 +969,7 @@ + ]) + AC_DEFUN([_CR_CHECK_VMLINUX],[ + AC_REQUIRE([AC_PROG_NM]) +- if test -n "$1" -a -r "$1" && ($NM "$1" | grep ' [[AB]] _end') >/dev/null 2>/dev/null; then ++ if test -n "$1" -a -r "$1" && ($NM "$1" | grep cr_ksymtab_patt) >/dev/null 2>/dev/null; then + LINUX_VMLINUX="$1" + LINUX_SYMTAB_FILE="$1" + LINUX_SYMTAB_CMD="$NM $1 2>/dev/null" +diff -r 3c8a74e0c599 aclocal.m4 +--- a/aclocal.m4 Sun Apr 11 12:41:30 2010 +0200 ++++ b/aclocal.m4 Sun Apr 11 16:31:36 2010 +0200 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.8.3 -*- Autoconf -*- +- +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +-# Free Software Foundation, Inc. ++# generated automatically by aclocal 1.11.1 -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2007, 2008, 2009 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. +@@ -11,103 +11,196 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, ++[m4_warning([this file was generated for autoconf 2.65. ++You have another version of autoconf. It may work, but is not guaranteed to. ++If you have problems, you may need to regenerate the build system entirely. ++To do so, use the procedure documented by the package, typically `autoreconf'.])]) ++ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +- +-# serial 47 AC_PROG_LIBTOOL +- +- +-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +-# ----------------------------------------------------------- +-# If this macro is not defined by Autoconf, define it here. +-m4_ifdef([AC_PROVIDE_IFELSE], +- [], +- [m4_define([AC_PROVIDE_IFELSE], +- [m4_ifdef([AC_PROVIDE_$1], +- [$2], [$3])])]) +- +- +-# AC_PROG_LIBTOOL +-# --------------- +-AC_DEFUN([AC_PROG_LIBTOOL], +-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. +- AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [AC_LIBTOOL_CXX], +- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX +- ])]) +-dnl And a similar setup for Fortran 77 support +- AC_PROVIDE_IFELSE([AC_PROG_F77], +- [AC_LIBTOOL_F77], +- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +-])]) +- +-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. +- AC_PROVIDE_IFELSE([AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [ifdef([AC_PROG_GCJ], +- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([A][M_PROG_GCJ], +- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([LT_AC_PROG_GCJ], +- [define([LT_AC_PROG_GCJ], +- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +-])])# AC_PROG_LIBTOOL +- +- +-# _AC_PROG_LIBTOOL +-# ---------------- +-AC_DEFUN([_AC_PROG_LIBTOOL], +-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# 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. ++ ++m4_define([_LT_COPYING], [dnl ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is part of GNU Libtool. ++# ++# GNU Libtool 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. ++# ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or ++# obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++]) ++ ++# serial 56 LT_INIT ++ ++ ++# LT_PREREQ(VERSION) ++# ------------------ ++# Complain and exit if this libtool version is less that VERSION. ++m4_defun([LT_PREREQ], ++[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, ++ [m4_default([$3], ++ [m4_fatal([Libtool version $1 or higher is required], ++ 63)])], ++ [$2])]) ++ ++ ++# _LT_CHECK_BUILDDIR ++# ------------------ ++# Complain if the absolute build directory name contains unusual characters ++m4_defun([_LT_CHECK_BUILDDIR], ++[case `pwd` in ++ *\ * | *\ *) ++ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; ++esac ++]) ++ ++ ++# LT_INIT([OPTIONS]) ++# ------------------ ++AC_DEFUN([LT_INIT], ++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT ++AC_BEFORE([$0], [LT_LANG])dnl ++AC_BEFORE([$0], [LT_OUTPUT])dnl ++AC_BEFORE([$0], [LTDL_INIT])dnl ++m4_require([_LT_CHECK_BUILDDIR])dnl ++ ++dnl Autoconf doesn't catch unexpanded LT_ macros by default: ++m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl ++m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl ++dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 ++dnl unless we require an AC_DEFUNed macro: ++AC_REQUIRE([LTOPTIONS_VERSION])dnl ++AC_REQUIRE([LTSUGAR_VERSION])dnl ++AC_REQUIRE([LTVERSION_VERSION])dnl ++AC_REQUIRE([LTOBSOLETE_VERSION])dnl ++m4_require([_LT_PROG_LTMAIN])dnl ++ ++dnl Parse OPTIONS ++_LT_SET_OPTIONS([$0], [$1]) + + # This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' + AC_SUBST(LIBTOOL)dnl + +-# Prevent multiple expansion +-define([AC_PROG_LIBTOOL], []) +-])# _AC_PROG_LIBTOOL +- +- +-# AC_LIBTOOL_SETUP +-# ---------------- +-AC_DEFUN([AC_LIBTOOL_SETUP], +-[AC_PREREQ(2.50)dnl +-AC_REQUIRE([AC_ENABLE_SHARED])dnl +-AC_REQUIRE([AC_ENABLE_STATIC])dnl +-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl ++_LT_SETUP ++ ++# Only expand once: ++m4_define([LT_INIT]) ++])# LT_INIT ++ ++# Old names: ++AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) ++AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_PROG_LIBTOOL], []) ++dnl AC_DEFUN([AM_PROG_LIBTOOL], []) ++ ++ ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++m4_defun([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++]) ++ ++ ++# _LT_FILEUTILS_DEFAULTS ++# ---------------------- ++# It is okay to use these file commands and assume they have been set ++# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. ++m4_defun([_LT_FILEUTILS_DEFAULTS], ++[: ${CP="cp -f"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++])# _LT_FILEUTILS_DEFAULTS ++ ++ ++# _LT_SETUP ++# --------- ++m4_defun([_LT_SETUP], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++_LT_DECL([], [host_alias], [0], [The host system])dnl ++_LT_DECL([], [host], [0])dnl ++_LT_DECL([], [host_os], [0])dnl ++dnl ++_LT_DECL([], [build_alias], [0], [The build system])dnl ++_LT_DECL([], [build], [0])dnl ++_LT_DECL([], [build_os], [0])dnl ++dnl + AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_PROG_LD])dnl +-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +-AC_REQUIRE([AC_PROG_NM])dnl +- ++AC_REQUIRE([LT_PATH_LD])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++dnl + AC_REQUIRE([AC_PROG_LN_S])dnl +-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +-AC_REQUIRE([AC_OBJEXT])dnl +-AC_REQUIRE([AC_EXEEXT])dnl ++test -z "$LN_S" && LN_S="ln -s" ++_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl + dnl +- +-AC_LIBTOOL_SYS_MAX_CMD_LEN +-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-AC_LIBTOOL_OBJDIR +- +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-_LT_AC_PROG_ECHO_BACKSLASH ++AC_REQUIRE([LT_CMD_MAX_LEN])dnl ++_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl ++_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl ++dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_CMD_RELOAD])dnl ++m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CMD_OLD_ARCHIVE])dnl ++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++ ++_LT_CONFIG_LIBTOOL_INIT([ ++# See if we are running on zsh, and set the options which allow our ++# commands through without removal of \ escapes INIT. ++if test -n "\${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++]) ++if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++ ++_LT_CHECK_OBJDIR ++ ++m4_require([_LT_TAG_COMPILER])dnl ++_LT_PROG_ECHO_BACKSLASH + + case $host_os in + aix3*) +@@ -123,174 +216,879 @@ + + # Sed substitution that helps us do robust quoting. It backslashifies + # metacharacters that are still active within double-quoted strings. +-Xsed='sed -e s/^X//' +-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] ++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + + # Same as above, but do not quote variable references. +-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] ++double_quote_subst='s/\([["`\\]]\)/\\\1/g' + + # Sed substitution to delay expansion of an escaped shell variable in a + # double_quote_subst'ed string. + delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + ++# Sed substitution to delay expansion of an escaped single quote. ++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' ++ + # Sed substitution to avoid accidental globbing in evaled expressions + no_glob_subst='s/\*/\\\*/g' + +-# Constants: +-rm="rm -f" +- + # Global variables: +-default_ofile=libtool ++ofile=libtool + can_build_shared=yes + +-# All known linkers require a `.a' archive for static linking (except M$VC, ++# All known linkers require a `.a' archive for static linking (except MSVC, + # which needs '.lib'). + libext=a +-ltmain="$ac_aux_dir/ltmain.sh" +-ofile="$default_ofile" ++ + with_gnu_ld="$lt_cv_prog_gnu_ld" + +-AC_CHECK_TOOL(AR, ar, false) +-AC_CHECK_TOOL(RANLIB, ranlib, :) +-AC_CHECK_TOOL(STRIP, strip, :) +- + old_CC="$CC" + old_CFLAGS="$CFLAGS" + + # Set sane defaults for various variables +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-test -z "$AS" && AS=as + test -z "$CC" && CC=cc + test -z "$LTCC" && LTCC=$CC +-test -z "$DLLTOOL" && DLLTOOL=dlltool ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS + test -z "$LD" && LD=ld +-test -z "$LN_S" && LN_S="ln -s" ++test -z "$ac_objext" && ac_objext=o ++ ++_LT_CC_BASENAME([$compiler]) ++ ++# Only perform the check for file, if the check method requires it + test -z "$MAGIC_CMD" && MAGIC_CMD=file +-test -z "$NM" && NM=nm +-test -z "$SED" && SED=sed +-test -z "$OBJDUMP" && OBJDUMP=objdump +-test -z "$RANLIB" && RANLIB=: +-test -z "$STRIP" && STRIP=: +-test -z "$ac_objext" && ac_objext=o +- +-# Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +-old_postinstall_cmds='chmod 644 $oldlib' +-old_postuninstall_cmds= +- +-if test -n "$RANLIB"; then +- case $host_os in +- openbsd*) +- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" +- ;; +- *) +- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" +- ;; +- esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +-fi +- +-# Only perform the check for file, if the check method requires it + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- AC_PATH_MAGIC ++ _LT_PATH_MAGIC + fi + ;; + esac + +-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-enable_win32_dll=yes, enable_win32_dll=no) +- +-AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +- +-AC_ARG_WITH([pic], +- [AC_HELP_STRING([--with-pic], +- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], +- [pic_mode="$withval"], +- [pic_mode=default]) +-test -z "$pic_mode" && pic_mode=default +- + # Use C for the default configuration in the libtool script +-tagname= +-AC_LIBTOOL_LANG_C_CONFIG +-_LT_AC_TAGCONFIG +-])# AC_LIBTOOL_SETUP +- +- +-# _LT_AC_SYS_COMPILER ++LT_SUPPORTED_TAG([CC]) ++_LT_LANG_C_CONFIG ++_LT_LANG_DEFAULT_CONFIG ++_LT_CONFIG_COMMANDS ++])# _LT_SETUP ++ ++ ++# _LT_PROG_LTMAIN ++# --------------- ++# Note that this code is called both from `configure', and `config.status' ++# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, ++# `config.status' has no value for ac_aux_dir unless we are using Automake, ++# so we pass a copy along to make sure it has a sensible value anyway. ++m4_defun([_LT_PROG_LTMAIN], ++[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl ++_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) ++ltmain="$ac_aux_dir/ltmain.sh" ++])# _LT_PROG_LTMAIN ++ ++ ++ ++# So that we can recreate a full libtool script including additional ++# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS ++# in macros and then make a single call at the end using the `libtool' ++# label. ++ ++ ++# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) ++# ---------------------------------------- ++# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++m4_define([_LT_CONFIG_LIBTOOL_INIT], ++[m4_ifval([$1], ++ [m4_append([_LT_OUTPUT_LIBTOOL_INIT], ++ [$1 ++])])]) ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_INIT]) ++ ++ ++# _LT_CONFIG_LIBTOOL([COMMANDS]) ++# ------------------------------ ++# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++m4_define([_LT_CONFIG_LIBTOOL], ++[m4_ifval([$1], ++ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], ++ [$1 ++])])]) ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) ++ ++ ++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) ++# ----------------------------------------------------- ++m4_defun([_LT_CONFIG_SAVE_COMMANDS], ++[_LT_CONFIG_LIBTOOL([$1]) ++_LT_CONFIG_LIBTOOL_INIT([$2]) ++]) ++ ++ ++# _LT_FORMAT_COMMENT([COMMENT]) ++# ----------------------------- ++# Add leading comment marks to the start of each line, and a trailing ++# full-stop to the whole comment if one is not present already. ++m4_define([_LT_FORMAT_COMMENT], ++[m4_ifval([$1], [ ++m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], ++ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) ++)]) ++ ++ ++ ++ ++ ++# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) ++# ------------------------------------------------------------------- ++# CONFIGNAME is the name given to the value in the libtool script. ++# VARNAME is the (base) name used in the configure script. ++# VALUE may be 0, 1 or 2 for a computed quote escaped value based on ++# VARNAME. Any other value will be used directly. ++m4_define([_LT_DECL], ++[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], ++ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], ++ [m4_ifval([$1], [$1], [$2])]) ++ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) ++ m4_ifval([$4], ++ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) ++ lt_dict_add_subkey([lt_decl_dict], [$2], ++ [tagged?], [m4_ifval([$5], [yes], [no])])]) ++]) ++ ++ ++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) ++# -------------------------------------------------------- ++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) ++ ++ ++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) ++# ------------------------------------------------ ++m4_define([lt_decl_tag_varnames], ++[_lt_decl_filter([tagged?], [yes], $@)]) ++ ++ ++# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) ++# --------------------------------------------------------- ++m4_define([_lt_decl_filter], ++[m4_case([$#], ++ [0], [m4_fatal([$0: too few arguments: $#])], ++ [1], [m4_fatal([$0: too few arguments: $#: $1])], ++ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], ++ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], ++ [lt_dict_filter([lt_decl_dict], $@)])[]dnl ++]) ++ ++ ++# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) ++# -------------------------------------------------- ++m4_define([lt_decl_quote_varnames], ++[_lt_decl_filter([value], [1], $@)]) ++ ++ ++# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) ++# --------------------------------------------------- ++m4_define([lt_decl_dquote_varnames], ++[_lt_decl_filter([value], [2], $@)]) ++ ++ ++# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) ++# --------------------------------------------------- ++m4_define([lt_decl_varnames_tagged], ++[m4_assert([$# <= 2])dnl ++_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), ++ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) ++m4_define([_lt_decl_varnames_tagged], ++[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) ++ ++ ++# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) ++# ------------------------------------------------ ++m4_define([lt_decl_all_varnames], ++[_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_if([$2], [], ++ m4_quote(lt_decl_varnames), ++ m4_quote(m4_shift($@))))[]dnl ++]) ++m4_define([_lt_decl_all_varnames], ++[lt_join($@, lt_decl_varnames_tagged([$1], ++ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl ++]) ++ ++ ++# _LT_CONFIG_STATUS_DECLARE([VARNAME]) ++# ------------------------------------ ++# Quote a variable value, and forward it to `config.status' so that its ++# declaration there will have the same value as in `configure'. VARNAME ++# must have a single quote delimited value for this to work. ++m4_define([_LT_CONFIG_STATUS_DECLARE], ++[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) ++ ++ ++# _LT_CONFIG_STATUS_DECLARATIONS ++# ------------------------------ ++# We delimit libtool config variables with single quotes, so when ++# we write them to config.status, we have to be sure to quote all ++# embedded single quotes properly. In configure, this macro expands ++# each variable declared with _LT_DECL (and _LT_TAGDECL) into: ++# ++# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' ++m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], ++[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), ++ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) ++ ++ ++# _LT_LIBTOOL_TAGS ++# ---------------- ++# Output comment and list of tags supported by the script ++m4_defun([_LT_LIBTOOL_TAGS], ++[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl ++available_tags="_LT_TAGS"dnl ++]) ++ ++ ++# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) ++# ----------------------------------- ++# Extract the dictionary values for VARNAME (optionally with TAG) and ++# expand to a commented shell variable setting: ++# ++# # Some comment about what VAR is for. ++# visible_name=$lt_internal_name ++m4_define([_LT_LIBTOOL_DECLARE], ++[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], ++ [description])))[]dnl ++m4_pushdef([_libtool_name], ++ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl ++m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), ++ [0], [_libtool_name=[$]$1], ++ [1], [_libtool_name=$lt_[]$1], ++ [2], [_libtool_name=$lt_[]$1], ++ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl ++m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl ++]) ++ ++ ++# _LT_LIBTOOL_CONFIG_VARS ++# ----------------------- ++# Produce commented declarations of non-tagged libtool config variables ++# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' ++# script. Tagged libtool config variables (even for the LIBTOOL CONFIG ++# section) are produced by _LT_LIBTOOL_TAG_VARS. ++m4_defun([_LT_LIBTOOL_CONFIG_VARS], ++[m4_foreach([_lt_var], ++ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), ++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) ++ ++ ++# _LT_LIBTOOL_TAG_VARS(TAG) ++# ------------------------- ++m4_define([_LT_LIBTOOL_TAG_VARS], ++[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), ++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) ++ ++ ++# _LT_TAGVAR(VARNAME, [TAGNAME]) ++# ------------------------------ ++m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) ++ ++ ++# _LT_CONFIG_COMMANDS + # ------------------- +-AC_DEFUN([_LT_AC_SYS_COMPILER], ++# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of ++# variables for single and double quote escaping we saved from calls ++# to _LT_DECL, we can put quote escaped variables declarations ++# into `config.status', and then the shell code to quote escape them in ++# for loops in `config.status'. Finally, any additional code accumulated ++# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. ++m4_defun([_LT_CONFIG_COMMANDS], ++[AC_PROVIDE_IFELSE([LT_OUTPUT], ++ dnl If the libtool generation code has been placed in $CONFIG_LT, ++ dnl instead of duplicating it all over again into config.status, ++ dnl then we will have config.status run $CONFIG_LT later, so it ++ dnl needs to know what name is stored there: ++ [AC_CONFIG_COMMANDS([libtool], ++ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], ++ dnl If the libtool generation code is destined for config.status, ++ dnl expand the accumulated commands and init code now: ++ [AC_CONFIG_COMMANDS([libtool], ++ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) ++])#_LT_CONFIG_COMMANDS ++ ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], ++[ ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++sed_quote_subst='$sed_quote_subst' ++double_quote_subst='$double_quote_subst' ++delay_variable_subst='$delay_variable_subst' ++_LT_CONFIG_STATUS_DECLARATIONS ++LTCC='$LTCC' ++LTCFLAGS='$LTCFLAGS' ++compiler='$compiler_DEFAULT' ++ ++# Quote evaled strings. ++for var in lt_decl_all_varnames([[ \ ++]], lt_decl_quote_varnames); do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[[\\\\\\\`\\"\\\$]]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Double-quote double-evaled strings. ++for var in lt_decl_all_varnames([[ \ ++]], lt_decl_dquote_varnames); do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[[\\\\\\\`\\"\\\$]]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Fix-up fallback echo if it was mangled by the above quoting rules. ++case \$lt_ECHO in ++*'\\\[$]0 --fallback-echo"')dnl " ++ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` ++ ;; ++esac ++ ++_LT_OUTPUT_LIBTOOL_INIT ++]) ++ ++ ++# LT_OUTPUT ++# --------- ++# This macro allows early generation of the libtool script (before ++# AC_OUTPUT is called), incase it is used in configure for compilation ++# tests. ++AC_DEFUN([LT_OUTPUT], ++[: ${CONFIG_LT=./config.lt} ++AC_MSG_NOTICE([creating $CONFIG_LT]) ++cat >"$CONFIG_LT" <<_LTEOF ++#! $SHELL ++# Generated by $as_me. ++# Run this file to recreate a libtool stub with the current configuration. ++ ++lt_cl_silent=false ++SHELL=\${CONFIG_SHELL-$SHELL} ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++AS_SHELL_SANITIZE ++_AS_PREPARE ++ ++exec AS_MESSAGE_FD>&1 ++exec AS_MESSAGE_LOG_FD>>config.log ++{ ++ echo ++ AS_BOX([Running $as_me.]) ++} >&AS_MESSAGE_LOG_FD ++ ++lt_cl_help="\ ++\`$as_me' creates a local libtool stub from the current configuration, ++for use in further configure time tests before the real libtool is ++generated. ++ ++Usage: $[0] [[OPTIONS]] ++ ++ -h, --help print this help, then exit ++ -V, --version print version number, then exit ++ -q, --quiet do not print progress messages ++ -d, --debug don't remove temporary files ++ ++Report bugs to ." ++ ++lt_cl_version="\ ++m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl ++m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) ++configured by $[0], generated by m4_PACKAGE_STRING. ++ ++Copyright (C) 2008 Free Software Foundation, Inc. ++This config.lt script is free software; the Free Software Foundation ++gives unlimited permision to copy, distribute and modify it." ++ ++while test $[#] != 0 ++do ++ case $[1] in ++ --version | --v* | -V ) ++ echo "$lt_cl_version"; exit 0 ;; ++ --help | --h* | -h ) ++ echo "$lt_cl_help"; exit 0 ;; ++ --debug | --d* | -d ) ++ debug=: ;; ++ --quiet | --q* | --silent | --s* | -q ) ++ lt_cl_silent=: ;; ++ ++ -*) AC_MSG_ERROR([unrecognized option: $[1] ++Try \`$[0] --help' for more information.]) ;; ++ ++ *) AC_MSG_ERROR([unrecognized argument: $[1] ++Try \`$[0] --help' for more information.]) ;; ++ esac ++ shift ++done ++ ++if $lt_cl_silent; then ++ exec AS_MESSAGE_FD>/dev/null ++fi ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<_LTEOF ++_LT_OUTPUT_LIBTOOL_COMMANDS_INIT ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++AC_MSG_NOTICE([creating $ofile]) ++_LT_OUTPUT_LIBTOOL_COMMANDS ++AS_EXIT(0) ++_LTEOF ++chmod +x "$CONFIG_LT" ++ ++# configure is writing to config.log, but config.lt does its own redirection, ++# appending to config.log, which fails on DOS, as config.log is still kept ++# open by configure. Here we exec the FD to /dev/null, effectively closing ++# config.log, so it can be properly (re)opened and appended to by config.lt. ++if test "$no_create" != yes; then ++ lt_cl_success=: ++ test "$silent" = yes && ++ lt_config_lt_args="$lt_config_lt_args --quiet" ++ exec AS_MESSAGE_LOG_FD>/dev/null ++ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false ++ exec AS_MESSAGE_LOG_FD>>config.log ++ $lt_cl_success || AS_EXIT(1) ++fi ++])# LT_OUTPUT ++ ++ ++# _LT_CONFIG(TAG) ++# --------------- ++# If TAG is the built-in tag, create an initial libtool script with a ++# default configuration from the untagged config vars. Otherwise add code ++# to config.status for appending the configuration named by TAG from the ++# matching tagged config vars. ++m4_defun([_LT_CONFIG], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++_LT_CONFIG_SAVE_COMMANDS([ ++ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl ++ m4_if(_LT_TAG, [C], [ ++ # See if we are running on zsh, and set the options which allow our ++ # commands through without removal of \ escapes. ++ if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++ fi ++ ++ cfgfile="${ofile}T" ++ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 ++ $RM "$cfgfile" ++ ++ cat <<_LT_EOF >> "$cfgfile" ++#! $SHELL ++ ++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++# ++_LT_COPYING ++_LT_LIBTOOL_TAGS ++ ++# ### BEGIN LIBTOOL CONFIG ++_LT_LIBTOOL_CONFIG_VARS ++_LT_LIBTOOL_TAG_VARS ++# ### END LIBTOOL CONFIG ++ ++_LT_EOF ++ ++ case $host_os in ++ aix3*) ++ cat <<\_LT_EOF >> "$cfgfile" ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++fi ++_LT_EOF ++ ;; ++ esac ++ ++ _LT_PROG_LTMAIN ++ ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ _LT_PROG_XSI_SHELLFNS ++ ++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ mv -f "$cfgfile" "$ofile" || ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++], ++[cat <<_LT_EOF >> "$ofile" ++ ++dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded ++dnl in a comment (ie after a #). ++# ### BEGIN LIBTOOL TAG CONFIG: $1 ++_LT_LIBTOOL_TAG_VARS(_LT_TAG) ++# ### END LIBTOOL TAG CONFIG: $1 ++_LT_EOF ++])dnl /m4_if ++], ++[m4_if([$1], [], [ ++ PACKAGE='$PACKAGE' ++ VERSION='$VERSION' ++ TIMESTAMP='$TIMESTAMP' ++ RM='$RM' ++ ofile='$ofile'], []) ++])dnl /_LT_CONFIG_SAVE_COMMANDS ++])# _LT_CONFIG ++ ++ ++# LT_SUPPORTED_TAG(TAG) ++# --------------------- ++# Trace this macro to discover what tags are supported by the libtool ++# --tag option, using: ++# autoconf --trace 'LT_SUPPORTED_TAG:$1' ++AC_DEFUN([LT_SUPPORTED_TAG], []) ++ ++ ++# C support is built-in for now ++m4_define([_LT_LANG_C_enabled], []) ++m4_define([_LT_TAGS], []) ++ ++ ++# LT_LANG(LANG) ++# ------------- ++# Enable libtool support for the given language if not already enabled. ++AC_DEFUN([LT_LANG], ++[AC_BEFORE([$0], [LT_OUTPUT])dnl ++m4_case([$1], ++ [C], [_LT_LANG(C)], ++ [C++], [_LT_LANG(CXX)], ++ [Java], [_LT_LANG(GCJ)], ++ [Fortran 77], [_LT_LANG(F77)], ++ [Fortran], [_LT_LANG(FC)], ++ [Windows Resource], [_LT_LANG(RC)], ++ [m4_ifdef([_LT_LANG_]$1[_CONFIG], ++ [_LT_LANG($1)], ++ [m4_fatal([$0: unsupported language: "$1"])])])dnl ++])# LT_LANG ++ ++ ++# _LT_LANG(LANGNAME) ++# ------------------ ++m4_defun([_LT_LANG], ++[m4_ifdef([_LT_LANG_]$1[_enabled], [], ++ [LT_SUPPORTED_TAG([$1])dnl ++ m4_append([_LT_TAGS], [$1 ])dnl ++ m4_define([_LT_LANG_]$1[_enabled], [])dnl ++ _LT_LANG_$1_CONFIG($1)])dnl ++])# _LT_LANG ++ ++ ++# _LT_LANG_DEFAULT_CONFIG ++# ----------------------- ++m4_defun([_LT_LANG_DEFAULT_CONFIG], ++[AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [LT_LANG(CXX)], ++ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) ++ ++AC_PROVIDE_IFELSE([AC_PROG_F77], ++ [LT_LANG(F77)], ++ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) ++ ++AC_PROVIDE_IFELSE([AC_PROG_FC], ++ [LT_LANG(FC)], ++ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) ++ ++dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal ++dnl pulling things in needlessly. ++AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [AC_PROVIDE_IFELSE([LT_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [m4_ifdef([AC_PROG_GCJ], ++ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) ++ m4_ifdef([A][M_PROG_GCJ], ++ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) ++ m4_ifdef([LT_PROG_GCJ], ++ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) ++ ++AC_PROVIDE_IFELSE([LT_PROG_RC], ++ [LT_LANG(RC)], ++ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) ++])# _LT_LANG_DEFAULT_CONFIG ++ ++# Obsolete macros: ++AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) ++AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) ++AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) ++AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_CXX], []) ++dnl AC_DEFUN([AC_LIBTOOL_F77], []) ++dnl AC_DEFUN([AC_LIBTOOL_FC], []) ++dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) ++ ++ ++# _LT_TAG_COMPILER ++# ---------------- ++m4_defun([_LT_TAG_COMPILER], + [AC_REQUIRE([AC_PROG_CC])dnl + ++_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl ++_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl ++_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl ++_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl ++ + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ + # Allow CC to be a program name with arguments. + compiler=$CC +-])# _LT_AC_SYS_COMPILER +- +- +-# _LT_AC_SYS_LIBPATH_AIX ++])# _LT_TAG_COMPILER ++ ++ ++# _LT_COMPILER_BOILERPLATE ++# ------------------------ ++# Check for compiler boilerplate output or warnings with ++# the simple compiler test code. ++m4_defun([_LT_COMPILER_BOILERPLATE], ++[m4_require([_LT_DECL_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$RM conftest* ++])# _LT_COMPILER_BOILERPLATE ++ ++ ++# _LT_LINKER_BOILERPLATE + # ---------------------- ++# Check for linker boilerplate output or warnings with ++# the simple link test code. ++m4_defun([_LT_LINKER_BOILERPLATE], ++[m4_require([_LT_DECL_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$RM -r conftest* ++])# _LT_LINKER_BOILERPLATE ++ ++# _LT_REQUIRED_DARWIN_CHECKS ++# ------------------------- ++m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ ++ case $host_os in ++ rhapsody* | darwin*) ++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) ++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) ++ AC_CHECK_TOOL([LIPO], [lipo], [:]) ++ AC_CHECK_TOOL([OTOOL], [otool], [:]) ++ AC_CHECK_TOOL([OTOOL64], [otool64], [:]) ++ _LT_DECL([], [DSYMUTIL], [1], ++ [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) ++ _LT_DECL([], [NMEDIT], [1], ++ [Tool to change global to local symbols on Mac OS X]) ++ _LT_DECL([], [LIPO], [1], ++ [Tool to manipulate fat objects and archives on Mac OS X]) ++ _LT_DECL([], [OTOOL], [1], ++ [ldd/readelf like tool for Mach-O binaries on Mac OS X]) ++ _LT_DECL([], [OTOOL64], [1], ++ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) ++ ++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], ++ [lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ rm -rf libconftest.dylib* ++ echo "int foo(void){return 1;}" > conftest.c ++ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err ++ _lt_result=$? ++ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++ lt_cv_apple_cc_single_mod=yes ++ else ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ fi ++ rm -rf libconftest.dylib* ++ rm -f conftest.* ++ fi]) ++ AC_CACHE_CHECK([for -exported_symbols_list linker flag], ++ [lt_cv_ld_exported_symbols_list], ++ [lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [lt_cv_ld_exported_symbols_list=yes], ++ [lt_cv_ld_exported_symbols_list=no]) ++ LDFLAGS="$save_LDFLAGS" ++ ]) ++ case $host_os in ++ rhapsody* | darwin1.[[012]]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) # darwin 5.x on ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[[012]]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil='~$DSYMUTIL $lib || :' ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++]) ++ ++ ++# _LT_DARWIN_LINKER_FEATURES ++# -------------------------- ++# Checks for linker and compiler features on darwin ++m4_defun([_LT_DARWIN_LINKER_FEATURES], ++[ ++ m4_require([_LT_REQUIRED_DARWIN_CHECKS]) ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++ case $cc_basename in ++ ifort*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test "$_lt_dar_can_shared" = "yes"; then ++ output_verbose_link_cmd=echo ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ m4_if([$1], [CXX], ++[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" ++ fi ++],[]) ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++]) ++ ++# _LT_SYS_MODULE_PATH_AIX ++# ----------------------- + # Links a minimal program and checks the executable + # for the system default hardcoded library path. In most cases, + # this is /usr/lib:/lib, but when the MPI compilers are used + # the location of the communication and MPI libs are included too. + # If we don't find anything, use the default library path according + # to the aix ld manual. +-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++m4_defun([_LT_SYS_MODULE_PATH_AIX], ++[m4_require([_LT_DECL_SED])dnl ++AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi],[]) ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi],[]) + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +-])# _LT_AC_SYS_LIBPATH_AIX +- +- +-# _LT_AC_SHELL_INIT(ARG) +-# ---------------------- +-AC_DEFUN([_LT_AC_SHELL_INIT], ++])# _LT_SYS_MODULE_PATH_AIX ++ ++ ++# _LT_SHELL_INIT(ARG) ++# ------------------- ++m4_define([_LT_SHELL_INIT], + [ifdef([AC_DIVERSION_NOTICE], + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], + [AC_DIVERT_PUSH(NOTICE)]) + $1 + AC_DIVERT_POP +-])# _LT_AC_SHELL_INIT +- +- +-# _LT_AC_PROG_ECHO_BACKSLASH +-# -------------------------- ++])# _LT_SHELL_INIT ++ ++ ++# _LT_PROG_ECHO_BACKSLASH ++# ----------------------- + # Add some code to the start of the generated configure script which + # will find an echo command which doesn't interpret backslashes. +-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +-[_LT_AC_SHELL_INIT([ ++m4_defun([_LT_PROG_ECHO_BACKSLASH], ++[_LT_SHELL_INIT([ + # Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + +-case X$ECHO in ++case X$lt_ECHO in + X*--fallback-echo) + # Remove one level of quotation (which was required for Make). +- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ;; + esac + +-echo=${ECHO-echo} ++ECHO=${lt_ECHO-echo} + if test "X[$]1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test "X[$]1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then +- # Yippee, $echo works! ++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $ECHO works! + : + else + # Restart under the correct shell. +@@ -300,134 +1098,137 @@ + if test "X[$]1" = X--fallback-echo; then + # used as fallback echo + shift +- cat </dev/null && +- echo_test_string="`eval $cmd`" && +- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null +- then +- break +- fi +- done +-fi +- +-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- : +-else +- # The Solaris, AIX, and Digital Unix default echo programs unquote +- # backslashes. This makes it impossible to quote backslashes using +- # echo "$something" | sed 's/\\/\\\\/g' +- # +- # So, first we look for a working echo in the user's PATH. +- +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for dir in $PATH /usr/ucb; do ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++if test -z "$lt_ECHO"; then ++ if test "X${echo_test_string+set}" != Xset; then ++ # find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if { echo_test_string=`eval $cmd`; } 2>/dev/null && ++ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null ++ then ++ break ++ fi ++ done ++ fi ++ ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++ else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. ++ ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$dir/echo" ++ break ++ fi ++ done + IFS="$lt_save_ifs" +- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && +- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$dir/echo" +- break +- fi +- done +- IFS="$lt_save_ifs" +- +- if test "X$echo" = Xecho; then +- # We didn't find a better echo, so look for alternatives. +- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # This shell has a builtin print -r that does the trick. +- echo='print -r' +- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && +- test "X$CONFIG_SHELL" != X/bin/ksh; then +- # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +- export ORIGINAL_CONFIG_SHELL +- CONFIG_SHELL=/bin/ksh +- export CONFIG_SHELL +- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} +- else +- # Try using printf. +- echo='printf %s\n' +- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # Cool, printf works +- : +- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ ++ if test "X$ECHO" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ ECHO='print -r' ++ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++ else ++ # Try using printf. ++ ECHO='printf %s\n' ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then +- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL +- export CONFIG_SHELL +- SHELL="$CONFIG_SHELL" +- export SHELL +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- else +- # maybe with a smaller string... +- prev=: +- +- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do +- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null +- then +- break ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: ++ ++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done ++ ++ if test "$prev" != 'sed 50q "[$]0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ ECHO=echo + fi +- prev="$cmd" +- done +- +- if test "$prev" != 'sed 50q "[$]0"'; then +- echo_test_string=`eval $prev` +- export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} +- else +- # Oops. We lost completely, so just stick with echo. +- echo=echo +- fi ++ fi + fi + fi + fi + fi +-fi + + # Copy echo and quote the copy suitably for passing to libtool from + # the Makefile, instead of quoting the original, which is used later. +-ECHO=$echo +-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then +- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++lt_ECHO=$ECHO ++if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" + fi + +-AC_SUBST(ECHO) +-])])# _LT_AC_PROG_ECHO_BACKSLASH +- +- +-# _LT_AC_LOCK +-# ----------- +-AC_DEFUN([_LT_AC_LOCK], ++AC_SUBST(lt_ECHO) ++]) ++_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) ++_LT_DECL([], [ECHO], [1], ++ [An echo program that does not interpret backslashes]) ++])# _LT_PROG_ECHO_BACKSLASH ++ ++ ++# _LT_ENABLE_LOCK ++# --------------- ++m4_defun([_LT_ENABLE_LOCK], + [AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) ++ [AS_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) + test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + + # Some flags need to be propagated to the compiler or linker for good +@@ -438,12 +1239,12 @@ + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in +- *ELF-32*) +- HPUX_IA64_MODE="32" +- ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" +- ;; ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; + esac + fi + rm -rf conftest* +@@ -452,114 +1253,174 @@ + # Find out which ABI we are using. + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +- if test "$lt_cv_prog_gnu_ld" = yes; then +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -melf32bsmip" +- ;; +- *N32*) +- LD="${LD-ld} -melf32bmipn32" +- ;; +- *64-bit*) +- LD="${LD-ld} -melf64bmip" +- ;; +- esac +- else +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi + fi + rm -rf conftest* + ;; + +-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +- case "`/usr/bin/file conftest.o`" in +- *32-bit*) +- case $host in +- x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" +- ;; +- ppc64-*linux*|powerpc64-*linux*) +- LD="${LD-ld} -m elf32ppclinux" +- ;; +- s390x-*linux*) +- LD="${LD-ld} -m elf_s390" +- ;; +- sparc64-*linux*) +- LD="${LD-ld} -m elf32_sparc" +- ;; +- esac +- ;; ++ case `/usr/bin/file conftest.o` in ++ *32-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *64-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*|s390*-*tpf*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, ++ [AC_LANG_PUSH(C) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++ AC_LANG_POP]) ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in + *64-bit*) +- case $host in +- x86_64-*linux*) +- LD="${LD-ld} -m elf_x86_64" +- ;; +- ppc*-*linux*|powerpc*-*linux*) +- LD="${LD-ld} -m elf64ppc" +- ;; +- s390*-*linux*) +- LD="${LD-ld} -m elf64_s390" +- ;; +- sparc*-*linux*) +- LD="${LD-ld} -m elf64_sparc" +- ;; ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +- +-*-*-sco3.2v5*) +- # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -belf" +- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, +- [AC_LANG_PUSH(C) +- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) +- AC_LANG_POP]) +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" +- fi +- ;; +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-[*-*-cygwin* | *-*-mingw* | *-*-pw32*) +- AC_CHECK_TOOL(DLLTOOL, dlltool, false) +- AC_CHECK_TOOL(AS, as, false) +- AC_CHECK_TOOL(OBJDUMP, objdump, false) +- ;; +- ]) + esac + + need_locks="$enable_libtool_lock" +- +-])# _LT_AC_LOCK +- +- +-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++])# _LT_ENABLE_LOCK ++ ++ ++# _LT_CMD_OLD_ARCHIVE ++# ------------------- ++m4_defun([_LT_CMD_OLD_ARCHIVE], ++[AC_CHECK_TOOL(AR, ar, false) ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1]) ++ ++AC_CHECK_TOOL(STRIP, strip, :) ++test -z "$STRIP" && STRIP=: ++_LT_DECL([], [STRIP], [1], [A symbol stripping program]) ++ ++AC_CHECK_TOOL(RANLIB, ranlib, :) ++test -z "$RANLIB" && RANLIB=: ++_LT_DECL([], [RANLIB], [1], ++ [Commands used to install an old-style archive]) ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= ++ ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi ++_LT_DECL([], [old_postinstall_cmds], [2]) ++_LT_DECL([], [old_postuninstall_cmds], [2]) ++_LT_TAGDECL([], [old_archive_cmds], [2], ++ [Commands used to build an old-style archive]) ++])# _LT_CMD_OLD_ARCHIVE ++ ++ ++# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, + # [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) + # ---------------------------------------------------------------- + # Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], +-[AC_REQUIRE([LT_AC_PROG_SED]) ++AC_DEFUN([_LT_COMPILER_OPTION], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_SED])dnl + AC_CACHE_CHECK([$1], [$2], + [$2=no +- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -567,7 +1428,7 @@ + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +@@ -577,62 +1438,82 @@ + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test ! -s conftest.err; then ++ # So say no if there are warnings other than the usual output. ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi +- $rm conftest* ++ $RM conftest* + ]) + + if test x"[$]$2" = xyes; then +- ifelse([$5], , :, [$5]) ++ m4_if([$5], , :, [$5]) + else +- ifelse([$6], , :, [$6]) ++ m4_if([$6], , :, [$6]) + fi +-])# AC_LIBTOOL_COMPILER_OPTION +- +- +-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ------------------------------------------------------------ +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +-[AC_CACHE_CHECK([$1], [$2], ++])# _LT_COMPILER_OPTION ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) ++ ++ ++# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------- ++# Check whether the given linker option works ++AC_DEFUN([_LT_LINKER_OPTION], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_SED])dnl ++AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $3" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +- # The compiler can only warn and ignore the option if not recognized ++ # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD ++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi + else + $2=yes + fi + fi +- $rm conftest* ++ $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + ]) + + if test x"[$]$2" = xyes; then +- ifelse([$4], , :, [$4]) ++ m4_if([$4], , :, [$4]) + else +- ifelse([$5], , :, [$5]) ++ m4_if([$5], , :, [$5]) + fi +-])# AC_LIBTOOL_LINKER_OPTION +- +- +-# AC_LIBTOOL_SYS_MAX_CMD_LEN +-# -------------------------- +-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], +-[# find the maximum length of command line arguments ++])# _LT_LINKER_OPTION ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) ++ ++ ++# LT_CMD_MAX_LEN ++#--------------- ++AC_DEFUN([LT_CMD_MAX_LEN], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++# find the maximum length of command line arguments + AC_MSG_CHECKING([the maximum length of command line arguments]) + AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 +- testring="ABCD" ++ teststring="ABCD" + + case $build_os in + msdosdjgpp*) +@@ -650,7 +1531,7 @@ + lt_cv_sys_max_cmd_len=-1; + ;; + +- cygwin* | mingw*) ++ cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, +@@ -667,24 +1548,79 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + +- *) +- # If test is not a shell built-in, we'll probably end up computing a +- # maximum length that is only half of the actual maximum length, but +- # we can't tell. +- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \ +- = "XX$testring") >/dev/null 2>&1 && +- new_result=`expr "X$testring" : ".*" 2>&1` && +- lt_cv_sys_max_cmd_len=$new_result && +- test $i != 17 # 1/2 MB should be enough +- do +- i=`expr $i + 1` +- testring=$testring$testring +- done +- testring= +- # Add a significant safety factor because C++ compilers can tack on massive +- # amounts of additional arguments before passing them to the linker. +- # It appears as though 1/2 is a usable value. +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ ;; ++ ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; ++ ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) ++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++ if test -n "$lt_cv_sys_max_cmd_len"; then ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ else ++ # Make teststring a little bigger before we do anything with it. ++ # a 1K string should be a reasonable start. ++ for i in 1 2 3 4 5 6 7 8 ; do ++ teststring=$teststring$teststring ++ done ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ # If test is not a shell built-in, we'll probably end up computing a ++ # maximum length that is only half of the actual maximum length, but ++ # we can't tell. ++ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ ++ = "XX$teststring$teststring"; } >/dev/null 2>&1 && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ # Only check the string length outside the loop. ++ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on ++ # massive amounts of additional arguments before passing them to the ++ # linker. It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ fi + ;; + esac + ]) +@@ -693,27 +1629,35 @@ + else + AC_MSG_RESULT(none) + fi +-])# AC_LIBTOOL_SYS_MAX_CMD_LEN +- +- +-# _LT_AC_CHECK_DLFCN +-# -------------------- +-AC_DEFUN([_LT_AC_CHECK_DLFCN], +-[AC_CHECK_HEADERS(dlfcn.h)dnl +-])# _LT_AC_CHECK_DLFCN +- +- +-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +-# ------------------------------------------------------------------ +-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++max_cmd_len=$lt_cv_sys_max_cmd_len ++_LT_DECL([], [max_cmd_len], [0], ++ [What is the maximum length of a command?]) ++])# LT_CMD_MAX_LEN ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) ++ ++ ++# _LT_HEADER_DLFCN ++# ---------------- ++m4_defun([_LT_HEADER_DLFCN], ++[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl ++])# _LT_HEADER_DLFCN ++ ++ ++# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++# ---------------------------------------------------------------- ++m4_defun([_LT_TRY_DLOPEN_SELF], ++[m4_require([_LT_HEADER_DLFCN])dnl + if test "$cross_compiling" = yes; then : + [$4] + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < conftest.$ac_ext <<_LT_EOF + [#line __oline__ "configure" + #include "confdefs.h" + +@@ -755,10 +1699,6 @@ + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -771,17 +1711,19 @@ + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } +- +- exit (status); ++ else ++ puts (dlerror ()); ++ ++ return status; + }] +-EOF ++_LT_EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null ++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; +- x$lt_unknown|x*) $3 ;; ++ x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed +@@ -789,13 +1731,13 @@ + fi + fi + rm -fr conftest* +-])# _LT_AC_TRY_DLOPEN_SELF +- +- +-# AC_LIBTOOL_DLOPEN_SELF +-# ------------------- +-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++])# _LT_TRY_DLOPEN_SELF ++ ++ ++# LT_SYS_DLOPEN_SELF ++# ------------------ ++AC_DEFUN([LT_SYS_DLOPEN_SELF], ++[m4_require([_LT_HEADER_DLFCN])dnl + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown +@@ -811,15 +1753,15 @@ + lt_cv_dlopen_self=yes + ;; + +- mingw* | pw32*) ++ mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= +- ;; ++ ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= +- ;; ++ ;; + + darwin*) + # if libdl is installed we need to link against it +@@ -829,13 +1771,13 @@ + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) +- ;; ++ ;; + + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], +- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], +@@ -843,7 +1785,7 @@ + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], +- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + ]) + ]) + ]) +@@ -864,23 +1806,23 @@ + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" +- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl +- _LT_AC_TRY_DLOPEN_SELF( ++ _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + + if test "x$lt_cv_dlopen_self" = xyes; then +- LDFLAGS="$LDFLAGS $link_static_flag" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], +- lt_cv_dlopen_self_static, [dnl +- _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self_static, [dnl ++ _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) +@@ -902,22 +1844,36 @@ + *) enable_dlopen_self_static=unknown ;; + esac + fi +-])# AC_LIBTOOL_DLOPEN_SELF +- +- +-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) +-# --------------------------------- +-# Check to see if options -c and -o are simultaneously supported by compiler +-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], +-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++_LT_DECL([dlopen_support], [enable_dlopen], [0], ++ [Whether dlopen is supported]) ++_LT_DECL([dlopen_self], [enable_dlopen_self], [0], ++ [Whether dlopen of programs is supported]) ++_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], ++ [Whether dlopen of statically linked programs is supported]) ++])# LT_SYS_DLOPEN_SELF ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) ++ ++ ++# _LT_COMPILER_C_O([TAGNAME]) ++# --------------------------- ++# Check to see if options -c and -o are simultaneously supported by compiler. ++# This macro does not hard code the compiler like AC_PROG_CC_C_O. ++m4_defun([_LT_COMPILER_C_O], ++[m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_TAG_COMPILER])dnl + AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], +- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], +- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no +- $rm -r conftest 2>/dev/null ++ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++ $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or +@@ -925,7 +1881,7 @@ + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +@@ -937,35 +1893,41 @@ + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +- if test ! -s out/conftest.err; then +- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi +- chmod u+w . +- $rm conftest* ++ chmod u+w . 2>&AS_MESSAGE_LOG_FD ++ $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out + cd .. +- rmdir conftest +- $rm conftest* ++ $RM -r conftest ++ $RM conftest* + ]) +-])# AC_LIBTOOL_PROG_CC_C_O +- +- +-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) +-# ----------------------------------------- ++_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], ++ [Does compiler simultaneously support -c and -o options?]) ++])# _LT_COMPILER_C_O ++ ++ ++# _LT_COMPILER_FILE_LOCKS([TAGNAME]) ++# ---------------------------------- + # Check to see if we can do hard links to lock some files if needed +-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], +-[AC_REQUIRE([_LT_AC_LOCK])dnl ++m4_defun([_LT_COMPILER_FILE_LOCKS], ++[m4_require([_LT_ENABLE_LOCK])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++_LT_COMPILER_C_O([$1]) + + hard_links="nottested" +-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes +- $rm conftest* ++ $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no +@@ -978,12 +1940,13 @@ + else + need_locks=no + fi +-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS +- +- +-# AC_LIBTOOL_OBJDIR +-# ----------------- +-AC_DEFUN([AC_LIBTOOL_OBJDIR], ++_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) ++])# _LT_COMPILER_FILE_LOCKS ++ ++ ++# _LT_CHECK_OBJDIR ++# ---------------- ++m4_defun([_LT_CHECK_OBJDIR], + [AC_CACHE_CHECK([for objdir], [lt_cv_objdir], + [rm -f .libs 2>/dev/null + mkdir .libs 2>/dev/null +@@ -995,40 +1958,46 @@ + fi + rmdir .libs 2>/dev/null]) + objdir=$lt_cv_objdir +-])# AC_LIBTOOL_OBJDIR +- +- +-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) +-# ---------------------------------------------- ++_LT_DECL([], [objdir], [0], ++ [The name of the directory that contains temporary libtool files])dnl ++m4_pattern_allow([LT_OBJDIR])dnl ++AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", ++ [Define to the sub-directory in which libtool stores uninstalled libraries.]) ++])# _LT_CHECK_OBJDIR ++ ++ ++# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) ++# -------------------------------------- + # Check hardcoding attributes. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], ++m4_defun([_LT_LINKER_HARDCODE_LIBPATH], + [AC_MSG_CHECKING([how to hardcode library paths into programs]) +-_LT_AC_TAGVAR(hardcode_action, $1)= +-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ +- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ +- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then +- +- # We can hardcode non-existant directories. +- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && ++_LT_TAGVAR(hardcode_action, $1)= ++if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || ++ test -n "$_LT_TAGVAR(runpath_var, $1)" || ++ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++ ++ # We can hardcode non-existent directories. ++ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && +- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then ++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + # Linking always hardcodes the temporary library directory. +- _LT_AC_TAGVAR(hardcode_action, $1)=relink ++ _LT_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. +- _LT_AC_TAGVAR(hardcode_action, $1)=immediate ++ _LT_TAGVAR(hardcode_action, $1)=immediate + fi + else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. +- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported ++ _LT_TAGVAR(hardcode_action, $1)=unsupported + fi +-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) +- +-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then ++AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) ++ ++if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || ++ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then + # Fast installation is not supported + enable_fast_install=no + elif test "$shlibpath_overrides_runpath" = yes || +@@ -1036,47 +2005,111 @@ + # Fast installation is not necessary + enable_fast_install=needless + fi +-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH +- +- +-# AC_LIBTOOL_SYS_LIB_STRIP +-# ------------------------ +-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], +-[striplib= ++_LT_TAGDECL([], [hardcode_action], [0], ++ [How to hardcode a shared library path into an executable]) ++])# _LT_LINKER_HARDCODE_LIBPATH ++ ++ ++# _LT_CMD_STRIPLIB ++# ---------------- ++m4_defun([_LT_CMD_STRIPLIB], ++[m4_require([_LT_DECL_EGREP]) ++striplib= + old_striplib= + AC_MSG_CHECKING([whether stripping libraries is possible]) +-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then ++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + # FIXME - insert some real tests, host_os isn't really good enough + case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +-fi +- ;; +- *) +- AC_MSG_RESULT([no]) ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ old_striplib="$STRIP -S" ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ ;; ++ *) ++ AC_MSG_RESULT([no]) + ;; + esac + fi +-])# AC_LIBTOOL_SYS_LIB_STRIP +- +- +-# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) ++_LT_DECL([], [striplib], [1]) ++])# _LT_CMD_STRIPLIB ++ ++ ++# _LT_SYS_DYNAMIC_LINKER([TAG]) + # ----------------------------- + # PORTME Fill in your ld.so characteristics +-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], +-[AC_MSG_CHECKING([dynamic linker characteristics]) ++m4_defun([_LT_SYS_DYNAMIC_LINKER], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_OBJDUMP])dnl ++m4_require([_LT_DECL_SED])dnl ++AC_MSG_CHECKING([dynamic linker characteristics]) ++m4_if([$1], ++ [], [ ++if test "$GCC" = yes; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # Ok, now we have the path, separated by spaces, we can step through it ++ # and add multilib dir if necessary. ++ lt_tmp_lt_search_path_spec= ++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ for lt_sys_path in $lt_search_path_spec; do ++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++ else ++ test -d "$lt_sys_path" && \ ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++ fi ++ done ++ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' ++BEGIN {RS=" "; FS="/|\n";} { ++ lt_foo=""; ++ lt_count=0; ++ for (lt_i = NF; lt_i > 0; lt_i--) { ++ if ($lt_i != "" && $lt_i != ".") { ++ if ($lt_i == "..") { ++ lt_count++; ++ } else { ++ if (lt_count == 0) { ++ lt_foo="/" $lt_i lt_foo; ++ } else { ++ lt_count--; ++ } ++ } ++ } ++ } ++ if (lt_foo != "") { lt_freq[[lt_foo]]++; } ++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } ++}'` ++ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi]) + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -1086,20 +2119,6 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -1117,7 +2136,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[[4-9]]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -1136,7 +2155,7 @@ + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no +@@ -1162,9 +2181,18 @@ + ;; + + amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ case $host_cpu in ++ powerpc) ++ # Since July 2007 AmigaOS4 officially supports .so libraries. ++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ ;; ++ m68k) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ esac + ;; + + beos*) +@@ -1173,7 +2201,7 @@ + shlibpath_var=LIBRARY_PATH + ;; + +-bsdi4*) ++bsdi[[45]]*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -1187,24 +2215,28 @@ + # libtool to hard-code these into programs + ;; + +-cygwin* | mingw* | pw32*) ++cygwin* | mingw* | pw32* | cegcc*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname' ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname~ ++ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++ fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ +- $rm \$dlpath' ++ $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in +@@ -1213,25 +2245,25 @@ + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; +- mingw*) ++ mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then ++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; +@@ -1250,17 +2282,13 @@ + version_type=darwin + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++m4_if([$1], [],[ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -1277,20 +2305,17 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- +-freebsd*) +- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[[123]]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +@@ -1308,14 +2333,19 @@ + freebsd2*) + shlibpath_overrides_runpath=yes + ;; +- freebsd3.[01]* | freebsdelf3.[01]*) ++ freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +- *) # from 3.2 on ++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; + esac + ;; + +@@ -1335,9 +2365,9 @@ + version_type=sunos + need_lib_prefix=no + need_version=no +- case "$host_cpu" in ++ case $host_cpu in + ia64*) +- shrext='.so' ++ shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH +@@ -1351,19 +2381,19 @@ + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; +- hppa*64*) +- shrext='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext='.sl' ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +@@ -1375,6 +2405,18 @@ + postinstall_cmds='chmod 555 $lib' + ;; + ++interix[[3-9]]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ + irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; +@@ -1418,7 +2460,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -1427,6 +2469,17 @@ + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no ++ # Some binutils ld are patched to set DT_RUNPATH ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ ++ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], ++ [shlibpath_overrides_runpath=yes])]) ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir ++ + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. +@@ -1434,8 +2487,8 @@ + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -1447,7 +2500,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -1456,14 +2509,14 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' +@@ -1484,24 +2537,31 @@ + shlibpath_overrides_runpath=yes + ;; + +-nto-qnx*) +- version_type=linux ++*nto* | *qnx*) ++ version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='ldqnx.so' + ;; + + openbsd*) + version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no +- need_version=yes ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no +@@ -1517,7 +2577,7 @@ + + os2*) + libname_spec='$name' +- shrext=".dll" ++ shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' +@@ -1535,11 +2595,8 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +-sco3.2v5*) +- version_type=osf +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH ++rdos*) ++ dynamic_linker=no + ;; + + solaris*) +@@ -1567,7 +2624,7 @@ + need_version=yes + ;; + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' +@@ -1576,7 +2633,6 @@ + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) +@@ -1600,6 +2656,39 @@ + fi + ;; + ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ ++tpf*) ++ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ + uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -1613,271 +2702,59 @@ + esac + AC_MSG_RESULT([$dynamic_linker]) + test "$dynamic_linker" = no && can_build_shared=no +-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER +- +- +-# _LT_AC_TAGCONFIG +-# ---------------- +-AC_DEFUN([_LT_AC_TAGCONFIG], +-[AC_ARG_WITH([tags], +- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], +- [include additional configurations @<:@automatic@:>@])], +- [tagnames="$withval"]) +- +-if test -f "$ltmain" && test -n "$tagnames"; then +- if test ! -f "${ofile}"; then +- AC_MSG_WARN([output file `$ofile' does not exist]) +- fi +- +- if test -z "$LTCC"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" +- if test -z "$LTCC"; then +- AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) +- else +- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) +- fi +- fi +- +- # Extract list of available tagged configurations in $ofile. +- # Note that this assumes the entire list is on one line. +- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` +- +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for tagname in $tagnames; do +- IFS="$lt_save_ifs" +- # Check whether tagname contains only valid characters +- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in +- "") ;; +- *) AC_MSG_ERROR([invalid tag name: $tagname]) +- ;; +- esac +- +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null +- then +- AC_MSG_ERROR([tag name \"$tagname\" already exists]) +- fi +- +- # Update the list of available tags. +- if test -n "$tagname"; then +- echo appending configuration tag \"$tagname\" to $ofile +- +- case $tagname in +- CXX) +- if test -n "$CXX" && test "X$CXX" != "Xno"; then +- AC_LIBTOOL_LANG_CXX_CONFIG +- else +- tagname="" +- fi +- ;; +- +- F77) +- if test -n "$F77" && test "X$F77" != "Xno"; then +- AC_LIBTOOL_LANG_F77_CONFIG +- else +- tagname="" +- fi +- ;; +- +- GCJ) +- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then +- AC_LIBTOOL_LANG_GCJ_CONFIG +- else +- tagname="" +- fi +- ;; +- +- RC) +- AC_LIBTOOL_LANG_RC_CONFIG +- ;; +- +- *) +- AC_MSG_ERROR([Unsupported tag name: $tagname]) +- ;; +- esac +- +- # Append the new tag name to the list of available tags. +- if test -n "$tagname" ; then +- available_tags="$available_tags $tagname" +- fi +- fi +- done +- IFS="$lt_save_ifs" +- +- # Now substitute the updated list of available tags. +- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then +- mv "${ofile}T" "$ofile" +- chmod +x "$ofile" +- else +- rm -f "${ofile}T" +- AC_MSG_ERROR([unable to update list of available tagged configurations.]) +- fi ++ ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi +-])# _LT_AC_TAGCONFIG +- +- +-# AC_LIBTOOL_DLOPEN +-# ----------------- +-# enable checks for dlopen support +-AC_DEFUN([AC_LIBTOOL_DLOPEN], +- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_DLOPEN +- +- +-# AC_LIBTOOL_WIN32_DLL +-# -------------------- +-# declare package support for building win32 dll's +-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], +-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_WIN32_DLL +- +- +-# AC_ENABLE_SHARED([DEFAULT]) +-# --------------------------- +-# implement the --enable-shared flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_SHARED], +-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([shared], +- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], +- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_shared=yes ;; +- no) enable_shared=no ;; +- *) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_shared=]AC_ENABLE_SHARED_DEFAULT) +-])# AC_ENABLE_SHARED +- +- +-# AC_DISABLE_SHARED +-# ----------------- +-#- set the default shared flag to --disable-shared +-AC_DEFUN([AC_DISABLE_SHARED], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_SHARED(no) +-])# AC_DISABLE_SHARED +- +- +-# AC_ENABLE_STATIC([DEFAULT]) +-# --------------------------- +-# implement the --enable-static flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_STATIC], +-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([static], +- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], +- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_static=yes ;; +- no) enable_static=no ;; +- *) +- enable_static=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_static=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_static=]AC_ENABLE_STATIC_DEFAULT) +-])# AC_ENABLE_STATIC +- +- +-# AC_DISABLE_STATIC +-# ----------------- +-# set the default static flag to --disable-static +-AC_DEFUN([AC_DISABLE_STATIC], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_STATIC(no) +-])# AC_DISABLE_STATIC +- +- +-# AC_ENABLE_FAST_INSTALL([DEFAULT]) +-# --------------------------------- +-# implement the --enable-fast-install flag +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-AC_DEFUN([AC_ENABLE_FAST_INSTALL], +-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE([fast-install], +- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], +- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_fast_install=yes ;; +- no) enable_fast_install=no ;; +- *) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) +-])# AC_ENABLE_FAST_INSTALL +- +- +-# AC_DISABLE_FAST_INSTALL +-# ----------------------- +-# set the default to --disable-fast-install +-AC_DEFUN([AC_DISABLE_FAST_INSTALL], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_FAST_INSTALL(no) +-])# AC_DISABLE_FAST_INSTALL +- +- +-# AC_LIBTOOL_PICMODE([MODE]) ++ ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++fi ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++fi ++ ++_LT_DECL([], [variables_saved_for_relink], [1], ++ [Variables whose values should be saved in libtool wrapper scripts and ++ restored at link time]) ++_LT_DECL([], [need_lib_prefix], [0], ++ [Do we need the "lib" prefix for modules?]) ++_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) ++_LT_DECL([], [version_type], [0], [Library versioning type]) ++_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) ++_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) ++_LT_DECL([], [shlibpath_overrides_runpath], [0], ++ [Is shlibpath searched before the hard-coded library search path?]) ++_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) ++_LT_DECL([], [library_names_spec], [1], ++ [[List of archive names. First name is the real one, the rest are links. ++ The last name is the one that the linker finds with -lNAME]]) ++_LT_DECL([], [soname_spec], [1], ++ [[The coded name of the library, if different from the real name]]) ++_LT_DECL([], [postinstall_cmds], [2], ++ [Command to use after installation of a shared archive]) ++_LT_DECL([], [postuninstall_cmds], [2], ++ [Command to use after uninstallation of a shared archive]) ++_LT_DECL([], [finish_cmds], [2], ++ [Commands used to finish a libtool library installation in a directory]) ++_LT_DECL([], [finish_eval], [1], ++ [[As "finish_cmds", except a single script fragment to be evaled but ++ not shown]]) ++_LT_DECL([], [hardcode_into_libs], [0], ++ [Whether we should hardcode library paths into libraries]) ++_LT_DECL([], [sys_lib_search_path_spec], [2], ++ [Compile-time system search path for libraries]) ++_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], ++ [Run-time system search path for libraries]) ++])# _LT_SYS_DYNAMIC_LINKER ++ ++ ++# _LT_PATH_TOOL_PREFIX(TOOL) + # -------------------------- +-# implement the --with-pic flag +-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +-AC_DEFUN([AC_LIBTOOL_PICMODE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-pic_mode=ifelse($#,1,$1,default) +-])# AC_LIBTOOL_PICMODE +- +- +-# AC_PROG_EGREP +-# ------------- +-# This is predefined starting with Autoconf 2.54, so this conditional +-# definition can be removed once we require Autoconf 2.54 or later. +-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], +-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], +- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' +- fi]) +- EGREP=$ac_cv_prog_egrep +- AC_SUBST([EGREP]) +-])]) +- +- +-# AC_PATH_TOOL_PREFIX +-# ------------------- +-# find a file program which can recognise shared library +-AC_DEFUN([AC_PATH_TOOL_PREFIX], +-[AC_REQUIRE([AC_PROG_EGREP])dnl ++# find a file program which can recognize shared library ++AC_DEFUN([_LT_PATH_TOOL_PREFIX], ++[m4_require([_LT_DECL_EGREP])dnl + AC_MSG_CHECKING([for $1]) + AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, + [case $MAGIC_CMD in +@@ -1890,7 +2767,7 @@ + dnl $ac_dummy forces splitting on constant user-supplied paths. + dnl POSIX.2 word splitting is done only on the output of word expansions, + dnl not every word. This closes a longstanding sh security hole. +- ac_dummy="ifelse([$2], , $PATH, [$2])" ++ ac_dummy="m4_if([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. +@@ -1899,13 +2776,13 @@ + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) +- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else +- cat <&2 ++ cat <<_LT_EOF 1>&2 + + *** Warning: the command libtool uses to detect shared libraries, + *** $file_magic_cmd, produces output that libtool cannot recognize. +@@ -1916,7 +2793,7 @@ + *** may want to report the problem to your system manager and/or to + *** bug-libtool@gnu.org + +-EOF ++_LT_EOF + fi ;; + esac + fi +@@ -1933,37 +2810,47 @@ + else + AC_MSG_RESULT(no) + fi +-])# AC_PATH_TOOL_PREFIX +- +- +-# AC_PATH_MAGIC +-# ------------- +-# find a file program which can recognise a shared library +-AC_DEFUN([AC_PATH_MAGIC], +-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) ++_LT_DECL([], [MAGIC_CMD], [0], ++ [Used to examine libraries when file_magic_cmd begins with "file"])dnl ++])# _LT_PATH_TOOL_PREFIX ++ ++# Old name: ++AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) ++ ++ ++# _LT_PATH_MAGIC ++# -------------- ++# find a file program which can recognize a shared library ++m4_defun([_LT_PATH_MAGIC], ++[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) ++ _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi + fi +-])# AC_PATH_MAGIC +- +- +-# AC_PROG_LD ++])# _LT_PATH_MAGIC ++ ++ ++# LT_PATH_LD + # ---------- + # find the pathname to the GNU or non-GNU linker +-AC_DEFUN([AC_PROG_LD], +-[AC_ARG_WITH([gnu-ld], +- [AC_HELP_STRING([--with-gnu-ld], ++AC_DEFUN([LT_PATH_LD], ++[AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_DECL_EGREP])dnl ++ ++AC_ARG_WITH([gnu-ld], ++ [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test "$withval" = no || with_gnu_ld=yes], +- [with_gnu_ld=no]) +-AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++ [with_gnu_ld=no])dnl ++ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +@@ -1980,9 +2867,9 @@ + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld +- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` ++ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; +@@ -2009,7 +2896,7 @@ + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some GNU ld's only accept -v. ++ # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ else ++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ fi ++ ;; ++ ++cegcc) ++ # use the weaker test based on 'objdump'. See mingw*. ++ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +@@ -2124,13 +3045,13 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-freebsd* | kfreebsd*-gnu) +- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++freebsd* | dragonfly*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. +- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' ++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; +@@ -2146,7 +3067,7 @@ + + hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file +- case "$host_cpu" in ++ case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so +@@ -2162,6 +3083,11 @@ + esac + ;; + ++interix[[3-9]]*) ++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ++ ;; ++ + irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; +@@ -2173,21 +3099,12 @@ + ;; + + # This must be Linux ELF. +-linux*) +- case $host_cpu in +- alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64) +- lt_cv_deplibs_check_method=pass_all ;; +- *) +- # glibc up to 2.1.1 does not perform some relocations on ARM +- # this will be overridden with pass_all, but let us keep it just in case +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; +- esac +- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' +@@ -2200,17 +3117,15 @@ + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +-nto-qnx*) +- lt_cv_deplibs_check_method=unknown ++*nto* | *qnx*) ++ lt_cv_deplibs_check_method=pass_all + ;; + + openbsd*) +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else +- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +@@ -2218,7 +3133,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-sco3.2v5*) ++rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -2226,7 +3141,11 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' +@@ -2247,10 +3166,13 @@ + siemens) + lt_cv_deplibs_check_method=pass_all + ;; ++ pc) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + esac + ;; + +-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) ++tpf*) + lt_cv_deplibs_check_method=pass_all + ;; + esac +@@ -2258,58 +3180,106 @@ + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +-])# AC_DEPLIBS_CHECK_METHOD +- +- +-# AC_PROG_NM ++ ++_LT_DECL([], [deplibs_check_method], [1], ++ [Method to check whether dependent libraries are shared objects]) ++_LT_DECL([], [file_magic_cmd], [1], ++ [Command to use when deplibs_check_method == "file_magic"]) ++])# _LT_CHECK_MAGIC_METHOD ++ ++ ++# LT_PATH_NM + # ---------- +-# find the pathname to a BSD-compatible name lister +-AC_DEFUN([AC_PROG_NM], +-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, ++# find the pathname to a BSD- or MS-compatible name lister ++AC_DEFUN([LT_PATH_NM], ++[AC_REQUIRE([AC_PROG_CC])dnl ++AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, + [if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" + else +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- tmp_nm="$ac_dir/${ac_tool_prefix}nm" +- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then +- # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: +- # nm: unknown option "B" ignored +- # Tru64's nm complains that /dev/null is an invalid object file +- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in +- */dev/null* | *'Invalid file or object type'*) +- lt_cv_path_NM="$tmp_nm -B" +- break +- ;; +- *) +- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in +- */dev/null*) +- lt_cv_path_NM="$tmp_nm -p" ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" ++ fi ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) +- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but +- continue # so that we can try to find one that supports BSD flags ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac + ;; + esac +- esac +- fi ++ fi ++ done ++ IFS="$lt_save_ifs" + done +- IFS="$lt_save_ifs" +- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++ : ${lt_cv_path_NM=no} + fi]) +-NM="$lt_cv_path_NM" +-])# AC_PROG_NM +- +- +-# AC_CHECK_LIBM +-# ------------- ++if test "$lt_cv_path_NM" != "no"; then ++ NM="$lt_cv_path_NM" ++else ++ # Didn't find any BSD compatible name lister, look for dumpbin. ++ AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) ++ AC_SUBST([DUMPBIN]) ++ if test "$DUMPBIN" != ":"; then ++ NM="$DUMPBIN" ++ fi ++fi ++test -z "$NM" && NM=nm ++AC_SUBST([NM]) ++_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl ++ ++AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], ++ [lt_cv_nm_interface="BSD nm" ++ echo "int some_variable = 0;" > conftest.$ac_ext ++ (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$ac_compile" 2>conftest.err) ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) ++ cat conftest.out >&AS_MESSAGE_LOG_FD ++ if $GREP 'External.*some_variable' conftest.out > /dev/null; then ++ lt_cv_nm_interface="MS dumpbin" ++ fi ++ rm -f conftest*]) ++])# LT_PATH_NM ++ ++# Old names: ++AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) ++AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AM_PROG_NM], []) ++dnl AC_DEFUN([AC_PROG_NM], []) ++ ++ ++# LT_LIB_M ++# -------- + # check for math library +-AC_DEFUN([AC_CHECK_LIBM], ++AC_DEFUN([LT_LIB_M], + [AC_REQUIRE([AC_CANONICAL_HOST])dnl + LIBM= + case $host in +@@ -2324,1999 +3294,46 @@ + AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; + esac +-])# AC_CHECK_LIBM +- +- +-# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) +-# ----------------------------------- +-# sets LIBLTDL to the link flags for the libltdl convenience library and +-# LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL +-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If +-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will +-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with +-# '${top_srcdir}/' (note the single quotes!). If your package is not +-# flat and you're not using automake, define top_builddir and +-# top_srcdir appropriately in the Makefiles. +-AC_DEFUN([AC_LIBLTDL_CONVENIENCE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- case $enable_ltdl_convenience in +- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; +- "") enable_ltdl_convenience=yes +- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; +- esac +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la +- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" +-])# AC_LIBLTDL_CONVENIENCE +- +- +-# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) +-# ----------------------------------- +-# sets LIBLTDL to the link flags for the libltdl installable library and +-# LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL +-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If +-# DIRECTORY is not provided and an installed libltdl is not found, it is +-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' +-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single +-# quotes!). If your package is not flat and you're not using automake, +-# define top_builddir and top_srcdir appropriately in the Makefiles. +-# In the future, this macro may have to be called after AC_PROG_LIBTOOL. +-AC_DEFUN([AC_LIBLTDL_INSTALLABLE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- AC_CHECK_LIB(ltdl, lt_dlinit, +- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], +- [if test x"$enable_ltdl_install" = xno; then +- AC_MSG_WARN([libltdl not installed, but installation disabled]) +- else +- enable_ltdl_install=yes +- fi +- ]) +- if test x"$enable_ltdl_install" = x"yes"; then +- ac_configure_args="$ac_configure_args --enable-ltdl-install" +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la +- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- else +- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" +- LIBLTDL="-lltdl" +- LTDLINCL= +- fi +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" +-])# AC_LIBLTDL_INSTALLABLE +- +- +-# AC_LIBTOOL_CXX +-# -------------- +-# enable support for C++ libraries +-AC_DEFUN([AC_LIBTOOL_CXX], +-[AC_REQUIRE([_LT_AC_LANG_CXX]) +-])# AC_LIBTOOL_CXX +- +- +-# _LT_AC_LANG_CXX +-# --------------- +-AC_DEFUN([_LT_AC_LANG_CXX], +-[AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([AC_PROG_CXXCPP]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) +-])# _LT_AC_LANG_CXX +- +- +-# AC_LIBTOOL_F77 +-# -------------- +-# enable support for Fortran 77 libraries +-AC_DEFUN([AC_LIBTOOL_F77], +-[AC_REQUIRE([_LT_AC_LANG_F77]) +-])# AC_LIBTOOL_F77 +- +- +-# _LT_AC_LANG_F77 +-# --------------- +-AC_DEFUN([_LT_AC_LANG_F77], +-[AC_REQUIRE([AC_PROG_F77]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) +-])# _LT_AC_LANG_F77 +- +- +-# AC_LIBTOOL_GCJ +-# -------------- +-# enable support for GCJ libraries +-AC_DEFUN([AC_LIBTOOL_GCJ], +-[AC_REQUIRE([_LT_AC_LANG_GCJ]) +-])# AC_LIBTOOL_GCJ +- +- +-# _LT_AC_LANG_GCJ +-# --------------- +-AC_DEFUN([_LT_AC_LANG_GCJ], +-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], +- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], +- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], +- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) +-])# _LT_AC_LANG_GCJ +- +- +-# AC_LIBTOOL_RC +-# -------------- +-# enable support for Windows resource files +-AC_DEFUN([AC_LIBTOOL_RC], +-[AC_REQUIRE([LT_AC_PROG_RC]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) +-])# AC_LIBTOOL_RC +- +- +-# AC_LIBTOOL_LANG_C_CONFIG +-# ------------------------ +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) +-AC_DEFUN([_LT_AC_LANG_C_CONFIG], +-[lt_save_CC="$CC" +-AC_LANG_PUSH(C) +- +-# Source file extension for C test sources. +-ac_ext=c +- +-# Object file extension for compiled C test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext +- +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" +- +-# Code to be used in simple link tests +-lt_simple_link_test_code='int main(){return(0);}\n' +- +-_LT_AC_SYS_COMPILER +- +-# +-# Check for any special shared library compilation flags. +-# +-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)= +-if test "$GCC" = no; then +- case $host_os in +- sco3.2v5*) +- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf' +- ;; +- esac +-fi +-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then +- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries]) +- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then : +- else +- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure]) +- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no +- fi +-fi +- +- +-# +-# Check to make sure the static flag actually works. +-# +-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], +- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), +- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), +- [], +- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +- +- +-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +-AC_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF($1) +- +-# Report which librarie types wil actually be built +-AC_MSG_CHECKING([if libtool supports shared libraries]) +-AC_MSG_RESULT([$can_build_shared]) +- +-AC_MSG_CHECKING([whether to build shared libraries]) +-test "$can_build_shared" = "no" && enable_shared=no +- +-# On AIX, shared libraries and static libraries use the same namespace, and +-# are all built from PIC. +-case "$host_os" in +-aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; +- +-aix4*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi +- ;; +- darwin* | rhapsody*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- case "$host_os" in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +-esac +-AC_MSG_RESULT([$enable_shared]) +- +-AC_MSG_CHECKING([whether to build static libraries]) +-# Make sure either enable_shared or enable_static is yes. +-test "$enable_shared" = yes || enable_static=yes +-AC_MSG_RESULT([$enable_static]) +- +-AC_LIBTOOL_CONFIG($1) +- +-AC_LANG_POP +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_C_CONFIG +- +- +-# AC_LIBTOOL_LANG_CXX_CONFIG +-# -------------------------- +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) +-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], +-[AC_LANG_PUSH(C++) +-AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([AC_PROG_CXXCPP]) +- +-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +-_LT_AC_TAGVAR(allow_undefined_flag, $1)= +-_LT_AC_TAGVAR(always_export_symbols, $1)=no +-_LT_AC_TAGVAR(archive_expsym_cmds, $1)= +-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_direct, $1)=no +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no +-_LT_AC_TAGVAR(hardcode_automatic, $1)=no +-_LT_AC_TAGVAR(module_cmds, $1)= +-_LT_AC_TAGVAR(module_expsym_cmds, $1)= +-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +-_LT_AC_TAGVAR(no_undefined_flag, $1)= +-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- +-# Dependencies to place before and after the object being linked: +-_LT_AC_TAGVAR(predep_objects, $1)= +-_LT_AC_TAGVAR(postdep_objects, $1)= +-_LT_AC_TAGVAR(predeps, $1)= +-_LT_AC_TAGVAR(postdeps, $1)= +-_LT_AC_TAGVAR(compiler_lib_search_path, $1)= +- +-# Source file extension for C++ test sources. +-ac_ext=cc +- +-# Object file extension for compiled C++ test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext +- +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" +- +-# Code to be used in simple link tests +-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' +- +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER +- +-# Allow CC to be a program name with arguments. +-lt_save_CC=$CC +-lt_save_LD=$LD +-lt_save_GCC=$GCC +-GCC=$GXX +-lt_save_with_gnu_ld=$with_gnu_ld +-lt_save_path_LD=$lt_cv_path_LD +-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then +- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +-else +- unset lt_cv_prog_gnu_ld +-fi +-if test -n "${lt_cv_path_LDCXX+set}"; then +- lt_cv_path_LD=$lt_cv_path_LDCXX +-else +- unset lt_cv_path_LD +-fi +-test -z "${LDCXX+set}" || LD=$LDCXX +-CC=${CXX-"c++"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +- +-# We don't want -fno-exception wen compiling C++ code, so set the +-# no_builtin_flag separately +-if test "$GXX" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +-else +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= +-fi +- +-if test "$GXX" = yes; then +- # Set up default GNU C++ configuration +- +- AC_PROG_LD +- +- # Check if GNU C++ uses GNU ld as the underlying linker, since the +- # archiving commands below assume that GNU ld is being used. +- if test "$with_gnu_ld" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- +- # If archive_cmds runs LD, not CC, wlarc should be empty +- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to +- # investigate it a little bit more. (MM) +- wlarc='${wl}' +- +- # ancient GNU ld didn't support --whole-archive et. al. +- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ +- grep 'no-whole-archive' > /dev/null; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- fi +- else +- with_gnu_ld=no +- wlarc= +- +- # A generic and very simple default shared library creation +- # command for GNU C++ for the case where it uses the native +- # linker, instead of GNU ld. If possible, this setting should +- # overridden to take advantage of the native linker features on +- # the platform it is being used on. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- fi +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +-else +- GXX=no +- with_gnu_ld=no +- wlarc= +-fi +- +-# PORTME: fill in a description of your system's C++ link characteristics +-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +-_LT_AC_TAGVAR(ld_shlibs, $1)=yes +-case $host_os in +- aix3*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aix4* | aix5*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- aix_use_runtimelinking=no +- +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) +- for ld_flag in $LDFLAGS; do +- case $ld_flag in +- *-brtl*) +- aix_use_runtimelinking=yes +- break +- ;; +- esac +- done +- esac +- +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi +- +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +- +- _LT_AC_TAGVAR(archive_cmds, $1)='' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- +- if test "$GXX" = yes; then +- case $host_os in aix4.[012]|aix4.[012].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- else +- # We have old collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- fi +- esac +- shared_flag='-shared' +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi +- +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # -bexpall does not export symbols beginning with underscore (_) +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; +- chorus*) +- case $cc_basename in +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- +- darwin* | rhapsody*) +- if test "$GXX" = yes; then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- case "$host_os" in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- lt_int_apple_cc_single_mod=no +- output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes +- fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- +- dgux*) +- case $cc_basename in +- ec++) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- ghcx) +- # Green Hills C++ Compiler +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- freebsd[12]*) +- # C++ shared libraries reported to be fairly broken before switch to ELF +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- freebsd-elf*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- ;; +- freebsd* | kfreebsd*-gnu) +- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF +- # conventions +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- ;; +- gnu*) +- ;; +- hpux9*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- +- case $cc_basename in +- CC) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aCC) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- hpux10*|hpux11*) +- if test $with_gnu_ld = no; then +- case "$host_cpu" in +- hppa*64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; +- ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- ;; +- *) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- ;; +- esac +- fi +- case "$host_cpu" in +- hppa*64*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- ia64*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- ;; +- *) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- ;; +- esac +- +- case $cc_basename in +- CC) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aCC) +- case "$host_cpu" in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- if test $with_gnu_ld = no; then +- case "$host_cpu" in +- ia64*|hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- fi +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- irix5* | irix6*) +- case $cc_basename in +- CC) +- # SGI C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' +- +- # Archives containing C++ object files must be created using +- # "CC -ar", where "CC" is the IRIX C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' +- ;; +- *) +- if test "$GXX" = yes; then +- if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' +- fi +- fi +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- ;; +- esac +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; +- linux*) +- case $cc_basename in +- KCC) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' +- ;; +- icpc) +- # Intel C++ +- with_gnu_ld=yes +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +- ;; +- cxx) +- # Compaq C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' +- +- runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- esac +- ;; +- lynxos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- m88k*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- mvs*) +- case $cc_basename in +- cxx) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' +- wlarc= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- fi +- # Workaround some broken pre-1.5 toolchains +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' +- ;; +- osf3*) +- case $cc_basename in +- KCC) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' +- +- ;; +- RCC) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- cxx) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- osf4* | osf5*) +- case $cc_basename in +- KCC) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Archives containing C++ object files must be created using +- # the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' +- ;; +- RCC) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- cxx) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ +- echo "-hidden">> $lib.exp~ +- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ +- $rm $lib.exp' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- psos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- sco*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- case $cc_basename in +- CC) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- sunos4*) +- case $cc_basename in +- CC) +- # Sun C++ 4.x +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- lcc) +- # Lucid +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- solaris*) +- case $cc_basename in +- CC) +- # Sun C++ 4.2, 5.x and Centerline C++ +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- case $host_os in +- solaris2.[0-5] | solaris2.[0-5].*) ;; +- *) +- # The C++ compiler is used as linker so we must use $wl +- # flag to pass the commands to the underlying system +- # linker. +- # Supported since Solaris 2.6 (maybe 2.5.1?) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' +- ;; +- esac +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- +- # Archives containing C++ object files must be created using +- # "CC -xar", where "CC" is the Sun C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' +- ;; +- gcx) +- # Green Hills C++ Compiler +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- +- # The C++ compiler must be used to create the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' +- ;; +- *) +- # GNU C++ compiler with Solaris linker +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' +- if $CC --version | grep -v '^2\.7' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- else +- # g++ 2.7 appears to require `-G' NOT `-shared' on this +- # platform. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- fi +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' +- fi +- ;; +- esac +- ;; +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- ;; +- tandem*) +- case $cc_basename in +- NCC) +- # NonStop-UX NCC 3.20 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- vxworks*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +-esac +-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +- +-_LT_AC_TAGVAR(GCC, $1)="$GXX" +-_LT_AC_TAGVAR(LD, $1)="$LD" +- +-AC_LIBTOOL_POSTDEP_PREDEP($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +-AC_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF($1) +- +-AC_LIBTOOL_CONFIG($1) +- +-AC_LANG_POP +-CC=$lt_save_CC +-LDCXX=$LD +-LD=$lt_save_LD +-GCC=$lt_save_GCC +-with_gnu_ldcxx=$with_gnu_ld +-with_gnu_ld=$lt_save_with_gnu_ld +-lt_cv_path_LDCXX=$lt_cv_path_LD +-lt_cv_path_LD=$lt_save_path_LD +-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +-])# AC_LIBTOOL_LANG_CXX_CONFIG +- +-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) +-# ------------------------ +-# Figure out "hidden" library dependencies from verbose +-# compiler output when linking a shared library. +-# Parse the compiler output and extract the necessary +-# objects, libraries and library flags. +-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ +-dnl we can't use the lt_simple_compile_test_code here, +-dnl because it contains code intended for an executable, +-dnl not a library. It's possible we should let each +-dnl tag define a new lt_????_link_test_code variable, +-dnl but it's only used here... +-ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <> "$cfgfile" +-ifelse([$1], [], +-[#! $SHELL +- +-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) +-# NOTE: Changes made to this file will be lost: look at ltmain.sh. +-# +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +-# Free Software Foundation, Inc. +-# +-# This file is part of GNU Libtool: +-# Originally by Gordon Matzigkeit , 1996 +-# +-# 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. +- +-# A sed program that does not truncate output. +-SED=$lt_SED +- +-# Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="$SED -e s/^X//" +- +-# The HP-UX ksh and POSIX shell print the target directory to stdout +-# if CDPATH is set. +-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +- +-# The names of the tagged configurations supported by this script. +-available_tags= +- +-# ### BEGIN LIBTOOL CONFIG], +-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) +- +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +- +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL +- +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared +- +-# Whether or not to build static libraries. +-build_old_libs=$enable_static +- +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) +- +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) +- +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install +- +-# The host system. +-host_alias=$host_alias +-host=$host +- +-# An echo program that does not interpret backslashes. +-echo=$lt_echo +- +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS +- +-# A C compiler. +-LTCC=$lt_LTCC +- +-# A language-specific compiler. +-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) +- +-# Is the compiler the GNU C compiler? +-with_gcc=$_LT_AC_TAGVAR(GCC, $1) +- +-# An ERE matcher. +-EGREP=$lt_EGREP +- +-# The linker used to build libraries. +-LD=$lt_[]_LT_AC_TAGVAR(LD, $1) +- +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S +- +-# A BSD-compatible nm program. +-NM=$lt_NM +- +-# A symbol stripping program +-STRIP=$lt_STRIP +- +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD +- +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" +- +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" +- +-# Used on cygwin: assembler. +-AS=$lt_AS +- +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir +- +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +- +-# How to pass a linker flag through the compiler. +-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) +- +-# Object file suffix (normally "o"). +-objext="$ac_objext" +- +-# Old archive suffix (normally "a"). +-libext="$libext" +- +-# Shared library suffix (normally ".so"). +-shrext='$shrext' +- +-# Executable file suffix (normally ""). +-exeext="$exeext" +- +-# Additional compiler flags for building library objects. +-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +-pic_mode=$pic_mode +- +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len +- +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) +- +-# Must we lock files when doing compilation ? +-need_locks=$lt_need_locks +- +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix +- +-# Do we need a version for libraries? +-need_version=$need_version +- +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +- +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self +- +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static +- +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) +- +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) +- +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) +- +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) +- +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) +- +-# Library versioning type. +-version_type=$version_type +- +-# Format of library name prefix. +-libname_spec=$lt_libname_spec +- +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec +- +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec +- +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds +- +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) +- +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) +- +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) +-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds +- +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) +-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) +- +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) +- +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +- +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method +- +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd +- +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) +- +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) +- +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds +- +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval +- +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +- +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +- +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +- +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var +- +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var +- +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath +- +-# How to hardcode a shared library path into an executable. +-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) +- +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs +- +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) +- +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) +- +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) +- +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) +- +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) +- +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) +- +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) +- +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" +- +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) +- +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +- +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +- +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" +- +-# Set to yes if exported symbols are required. +-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) +- +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) +- +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds +- +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) +- +-# Symbols that must always be exported. +-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) +- +-ifelse([$1],[], +-[# ### END LIBTOOL CONFIG], +-[# ### END LIBTOOL TAG CONFIG: $tagname]) +- +-__EOF__ +- +-ifelse([$1],[], [ +- case $host_os in +- aix3*) +- cat <<\EOF >> "$cfgfile" +- +-# AIX sometimes has problems with the GCC collect2 program. For some +-# reason, if we set the COLLECT_NAMES environment variable, the problems +-# vanish in a puff of smoke. +-if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +-fi +-EOF +- ;; +- esac +- +- # We use sed instead of cat because bash on DJGPP gets confused if +- # if finds mixed CR/LF and LF-only lines. Since sed operates in +- # text mode, it properly converts lines to CR/LF. This bash problem +- # is reportedly fixed, but why not run on old versions too? +- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || \ +- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") +- chmod +x "$ofile" +-]) +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi +-fi +-])# AC_LIBTOOL_CONFIG +- +- +-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) +-# ------------------------------------------- +-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], +-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +- +-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++AC_SUBST([LIBM]) ++])# LT_LIB_M ++ ++# Old name: ++AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_CHECK_LIBM], []) ++ ++ ++# _LT_COMPILER_NO_RTTI([TAGNAME]) ++# ------------------------------- ++m4_defun([_LT_COMPILER_NO_RTTI], ++[m4_require([_LT_TAG_COMPILER])dnl ++ ++_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +- +- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], ++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++ ++ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], +- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) ++ [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) + fi +-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI +- +- +-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-# --------------------------------- +-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], +-[AC_REQUIRE([AC_CANONICAL_HOST]) +-AC_REQUIRE([AC_PROG_NM]) +-AC_REQUIRE([AC_OBJEXT]) ++_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], ++ [Compiler flag to turn off builtin functions]) ++])# _LT_COMPILER_NO_RTTI ++ ++ ++# _LT_CMD_GLOBAL_SYMBOLS ++# ---------------------- ++m4_defun([_LT_CMD_GLOBAL_SYMBOLS], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++AC_REQUIRE([LT_PATH_LD])dnl ++m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_TAG_COMPILER])dnl ++ + # Check for command to grab the raw symbol name followed by C symbol from nm. + AC_MSG_CHECKING([command to parse $NM output from $compiler object]) + AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +@@ -4330,29 +3347,18 @@ + # Regexp to match symbols that can be accessed directly from C. + sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +-# Transform the above into a raw symbol and a C symbol. +-symxfrm='\1 \2\3 \3' +- +-# Transform an extracted symbol line into a proper C declaration +-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" +- +-# Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" +- + # Define system-specific variables. + case $host_os in + aix*) + symcode='[[BCDT]]' + ;; +-cygwin* | mingw* | pw32*) ++cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +-hpux*) # Its linker distinguishes data from code symbols ++hpux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' + fi +- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; + irix* | nonstopux*) + symcode='[[BCDEGRST]]' +@@ -4360,49 +3366,89 @@ + osf*) + symcode='[[BCDEGQRST]]' + ;; +-solaris* | sysv5*) ++solaris*) + symcode='[[BDRT]]' + ;; ++sco3.2v5*) ++ symcode='[[DT]]' ++ ;; ++sysv4.2uw2*) ++ symcode='[[DT]]' ++ ;; ++sysv5* | sco5v6* | unixware* | OpenUNIX*) ++ symcode='[[ABDT]]' ++ ;; + sysv4) + symcode='[[DFNSTU]]' + ;; + esac + +-# Handle CRLF in mingw tool chain +-opt_cr= +-case $build_os in +-mingw*) +- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp +- ;; +-esac +- + # If we're using GNU nm, then use its standard symbol codes. + case `$NM -V 2>&1` in + *GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; + esac + +-# Try without a prefix undercore, then with it. ++# Transform an extracted symbol line into a proper C declaration. ++# Some systems (esp. on ia64) link data and code symbols differently, ++# so use this general approach. ++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++ ++# Transform an extracted symbol line into symbol name and symbol address ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++ ++# Handle CRLF in mingw tool chain ++opt_cr= ++case $build_os in ++mingw*) ++ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++ ;; ++esac ++ ++# Try without a prefix underscore, then with it. + for ac_symprfx in "" "_"; do + ++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++ symxfrm="\\1 $ac_symprfx\\2 \\2" ++ + # Write the raw and C identifiers. +- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" ++ if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ # Fake it for dumpbin and say T for any non-static function ++ # and D for any global variable. ++ # Also find C++ and __fastcall symbols from MSVC++, ++ # which start with @ or ?. ++ lt_cv_sys_global_symbol_pipe="$AWK ['"\ ++" {last_section=section; section=\$ 3};"\ ++" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ ++" \$ 0!~/External *\|/{next};"\ ++" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ ++" {if(hide[section]) next};"\ ++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ ++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ ++" s[1]~/^[@?]/{print s[1], s[1]; next};"\ ++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ ++" ' prfx=^$ac_symprfx]" ++ else ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++ fi + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* +- cat > conftest.$ac_ext < conftest.$ac_ext <<_LT_EOF + #ifdef __cplusplus + extern "C" { + #endif + char nm_test_var; +-void nm_test_func(){} ++void nm_test_func(void); ++void nm_test_func(void){} + #ifdef __cplusplus + } + #endif + int main(){nm_test_var='a';nm_test_func();return(0);} +-EOF ++_LT_EOF + + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. +@@ -4416,48 +3462,50 @@ + fi + + # Make sure that we snagged all the symbols we need. +- if grep ' nm_test_var$' "$nlist" >/dev/null; then +- if grep ' nm_test_func$' "$nlist" >/dev/null; then +- cat < conftest.$ac_ext ++ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then ++ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then ++ cat <<_LT_EOF > conftest.$ac_ext + #ifdef __cplusplus + extern "C" { + #endif + +-EOF ++_LT_EOF + # Now generate the symbol file. +- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' +- +- cat <> conftest.$ac_ext +-#if defined (__STDC__) && __STDC__ +-# define lt_ptr_t void * +-#else +-# define lt_ptr_t char * +-# define const +-#endif +- +-/* The mapping between symbol names and symbols. */ ++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' ++ ++ cat <<_LT_EOF >> conftest.$ac_ext ++ ++/* The mapping between symbol names and symbols. */ + const struct { + const char *name; +- lt_ptr_t address; ++ void *address; + } +-lt_preloaded_symbols[[]] = ++lt__PROGRAM__LTX_preloaded_symbols[[]] = + { +-EOF +- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext +- cat <<\EOF >> conftest.$ac_ext +- {0, (lt_ptr_t) 0} ++ { "@PROGRAM@", (void *) 0 }, ++_LT_EOF ++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext ++ cat <<\_LT_EOF >> conftest.$ac_ext ++ {0, (void *) 0} + }; + ++/* This works around a problem in FreeBSD linker */ ++#ifdef FREEBSD_WORKAROUND ++static const void *lt_preloaded_setup() { ++ return lt__PROGRAM__LTX_preloaded_symbols; ++} ++#endif ++ + #ifdef __cplusplus + } + #endif +-EOF ++_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" +- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" ++ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +@@ -4476,7 +3524,7 @@ + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi +- rm -f conftest* conftst* ++ rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then +@@ -4494,127 +3542,162 @@ + else + AC_MSG_RESULT(ok) + fi +-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +- +- +-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) +-# --------------------------------------- +-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], +-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= +-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= ++ ++_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], ++ [Take the output of nm and produce a listing of raw symbols and C names]) ++_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], ++ [Transform the output of nm in a proper C declaration]) ++_LT_DECL([global_symbol_to_c_name_address], ++ [lt_cv_sys_global_symbol_to_c_name_address], [1], ++ [Transform the output of nm in a C name address pair]) ++_LT_DECL([global_symbol_to_c_name_address_lib_prefix], ++ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], ++ [Transform the output of nm in a C name address pair when lib prefix is needed]) ++]) # _LT_CMD_GLOBAL_SYMBOLS ++ ++ ++# _LT_COMPILER_PIC([TAGNAME]) ++# --------------------------- ++m4_defun([_LT_COMPILER_PIC], ++[m4_require([_LT_TAG_COMPILER])dnl ++_LT_TAGVAR(lt_prog_compiler_wl, $1)= ++_LT_TAGVAR(lt_prog_compiler_pic, $1)= ++_LT_TAGVAR(lt_prog_compiler_static, $1)= + + AC_MSG_CHECKING([for $compiler option to produce PIC]) +- ifelse([$1],[CXX],[ ++m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; ++ + amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac + ;; +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; +- mingw* | os2* | pw32*) ++ mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ ;; ++ interix[[3-9]]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case "$host_cpu" in +- hppa*64*|ia64*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) + ;; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + case $host_os in +- aix4* | aix5*) ++ aix[[4-9]]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in +- cxch68) ++ cxch68*) + # Green Hills C++ Compiler +- # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++ # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + dgux*) + case $cc_basename in +- ec++) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ ec++*) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; +- ghcx) ++ ghcx*) + # Green Hills C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in +- CC) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" ++ CC*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; +- aCC) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" +- case "$host_cpu" in ++ aCC*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; +@@ -4622,38 +3705,69 @@ + ;; + esac + ;; ++ interix*) ++ # This is c89, which is MS Visual C++ (no shared libs) ++ # Anyone wants to do a port? ++ ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in +- CC) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ CC*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in +- KCC) ++ KCC*) + # KAI C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; +- icpc) +- # Intel C++ +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ecpc* ) ++ # old Intel C++ for x86_64 which still supported -KPIC. ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; +- cxx) ++ icpc* ) ++ # Intel C++, used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ xlc* | xlC*) ++ # IBM XL 8.0 on PPC ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ ;; ++ esac + ;; + esac + ;; +@@ -4663,31 +3777,36 @@ + ;; + mvs*) + case $cc_basename in +- cxx) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ++ cxx*) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; + osf3* | osf4* | osf5*) + case $cc_basename in +- KCC) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++ KCC*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; +- RCC) ++ RCC*) + # Rational C++ 2.4.1 +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; +- cxx) ++ cxx*) + # Digital/Compaq C++ +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; +@@ -4695,26 +3814,17 @@ + ;; + psos*) + ;; +- sco*) +- case $cc_basename in +- CC) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- *) +- ;; +- esac +- ;; + solaris*) + case $cc_basename in +- CC) ++ CC*) + # Sun C++ 4.2, 5.x and Centerline C++ +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; +- gcx) ++ gcx*) + # Green Hills C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; +@@ -4722,309 +3832,436 @@ + ;; + sunos4*) + case $cc_basename in +- CC) ++ CC*) + # Sun C++ 4.x +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; +- lcc) ++ lcc*) + # Lucid +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ esac ++ ;; + tandem*) + case $cc_basename in +- NCC) ++ NCC*) + # NonStop-UX NCC 3.20 +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; +- unixware*) +- ;; + vxworks*) + ;; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi + ], + [ + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac + ;; + +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ ;; ++ ++ hpux*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ ;; ++ ++ interix[[3-9]]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; + ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; ++ + sysv4*MP*) + if test -d /usr/nec; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case "$host_cpu" in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- ;; +- + *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + hpux9* | hpux10* | hpux11*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. +- case "$host_cpu" in ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + +- newsos6) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- +- linux*) +- case $CC in +- icc* | ecc*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ case $cc_basename in ++ # old Intel for x86_64 which still supported -KPIC. ++ ecc*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ # icc used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ icc* | ifort*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ # Lahey Fortran 8.1. ++ lf95*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; ++ xl*) ++ # IBM XL C 8.0/Fortran 10.1 on PPC ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ++ ;; ++ esac ++ ;; + esac + ;; + ++ newsos6) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; ++ + osf3* | osf4* | osf5*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + +- sco3.2v5*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn' ++ rdos*) ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + solaris*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++ esac + ;; + + sunos4*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + +- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ unicos*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ + uts4*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *) +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi + ]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ ;; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ++ ;; ++esac ++AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++ [How to pass a linker flag through the compiler]) + + # + # Check to make sure the PIC flag actually works. + # +-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then +- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], +- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), +- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], +- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in ++if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then ++ _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], ++ [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], ++ [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; +- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; ++ *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], +- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) + fi +-case "$host_os" in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" +- ;; +-esac +-]) +- +- +-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) +-# ------------------------------------ ++_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], ++ [Additional compiler flags for building library objects]) ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" ++_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++ _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), ++ $lt_tmp_static_flag, ++ [], ++ [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) ++_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], ++ [Compiler flag to prevent dynamic linking]) ++])# _LT_COMPILER_PIC ++ ++ ++# _LT_LINKER_SHLIBS([TAGNAME]) ++# ---------------------------- + # See if the linker supports building shared libraries. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], +-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +-ifelse([$1],[CXX],[ +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++m4_defun([_LT_LINKER_SHLIBS], ++[AC_REQUIRE([LT_PATH_LD])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++m4_require([_LT_TAG_COMPILER])dnl ++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++m4_if([$1], [CXX], [ ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +- aix4* | aix5*) ++ aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ++ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; +- cygwin* | mingw*) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ++ cygwin* | mingw* | cegcc*) ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + *) +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +-],[ ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++], [ + runpath_var= +- _LT_AC_TAGVAR(allow_undefined_flag, $1)= +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)= +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)= +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +- _LT_AC_TAGVAR(hardcode_automatic, $1)=no +- _LT_AC_TAGVAR(module_cmds, $1)= +- _LT_AC_TAGVAR(module_expsym_cmds, $1)= +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(allow_undefined_flag, $1)= ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)= ++ _LT_TAGVAR(archive_expsym_cmds, $1)= ++ _LT_TAGVAR(compiler_needs_object, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(hardcode_automatic, $1)=no ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++ _LT_TAGVAR(hardcode_libdir_separator, $1)= ++ _LT_TAGVAR(hardcode_minus_L, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_TAGVAR(inherit_rpath, $1)=no ++ _LT_TAGVAR(link_all_deplibs, $1)=unknown ++ _LT_TAGVAR(module_cmds, $1)= ++ _LT_TAGVAR(module_expsym_cmds, $1)= ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)= ++ _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= ++ _LT_TAGVAR(thread_safe_flag_spec, $1)= ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list +- _LT_AC_TAGVAR(include_expsyms, $1)= ++ _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. ++dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= + + case $host_os in +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. +@@ -5032,23 +4269,52 @@ + with_gnu_ld=no + fi + ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + esac + +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ _LT_TAGVAR(ld_shlibs, $1)=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then ++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac ++ + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <&2 ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 + + *** Warning: the GNU linker, at least up to release 2.9.1, is reported + *** to be unable to reliably create shared libraries on AIX. +@@ -5056,74 +4322,160 @@ + *** really care for shared libraries, you may want to modify your PATH + *** so that a non-GNU linker is found, and then restart. + +-EOF ++_LT_EOF + fi + ;; + + amigaos*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- +- # Samuel A. Falvo II reports +- # that the semantics of dynamic libraries on AmigaOS, at least up +- # to version 4, is to share data among multiple programs linked +- # with the same dynamic library. Since this doesn't match the +- # behavior of shared libraries on other platforms, we can't use +- # them. +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='' ++ ;; ++ m68k) ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac + ;; + + beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ cygwin* | mingw* | pw32* | cegcc*) ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' +- +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else +- ld_shlibs=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++ interix[[3-9]]*) ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) ++ tmp_diet=no ++ if test "$host_os" = linux-dietlibc; then ++ case $cc_basename in ++ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) ++ esac ++ fi ++ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ ++ && test "$tmp_diet" = no ++ then ++ tmp_addflag= ++ tmp_sharedflag='-shared' ++ case $cc_basename,$host_cpu in ++ pgcc*) # Portland Group C compiler ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ ifc* | ifort*) # Intel Fortran compiler ++ tmp_addflag=' -nofor_main' ;; ++ lf95*) # Lahey Fortran 8.1 ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= ++ tmp_sharedflag='--shared' ;; ++ xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) ++ tmp_sharedflag='-qmkshrobj' ++ tmp_addflag= ;; ++ esac ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(compiler_needs_object, $1)=yes ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ esac ++ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ++ if test "x$supports_anon_versioning" = xyes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ ++ case $cc_basename in ++ xlf*) ++ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ if test "x$supports_anon_versioning" = xyes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ fi ++ ;; ++ esac ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +- solaris* | sysv5*) +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <&2 ++ solaris*) ++ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 + + *** Warning: The releases 2.8.* of the GNU linker cannot reliably + *** create shared libraries on Solaris systems. Therefore, libtool +@@ -5132,86 +4484,87 @@ + *** your PATH or compiler configuration so that the native linker is + *** used, and then restart. + +-EOF +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++_LT_EOF ++ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ ;; ++ *) ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ + sunos4*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +- linux*) +- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then +- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds" +- supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in +- *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac +- if test $supports_anon_versioning = yes; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ +-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +-$echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ *) ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds" +- fi +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + +- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then +- runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- fi ++ if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then ++ runpath_var= ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- if test "$GCC" = yes && test -z "$link_static_flag"; then ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ _LT_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; + +- aix4* | aix5*) ++ aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -5221,23 +4574,24 @@ + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi + done ++ ;; + esac + + exp_sym_flag='-bexport' +@@ -5250,174 +4604,143 @@ + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + +- _LT_AC_TAGVAR(archive_cmds, $1)='' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(archive_cmds, $1)='' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GCC" = yes; then +- case $host_os in aix4.[012]|aix4.[012].*) ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null ++ if test -f "$collect2name" && ++ strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then +- # We have reworked collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ # We have reworked collect2 ++ : + else +- # We have old collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ # We have old collect2 ++ _LT_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi ++ ;; + esac + shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ _LT_TAGVAR(link_all_deplibs, $1)=no + else + # not using gcc + if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else +- if test "$aix_use_runtimelinking" = yes; then ++ if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' +- fi ++ fi + fi + fi + ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else ++ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ _LT_SYS_MODULE_PATH_AIX ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else + if test "$host_cpu" = ia64; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ _LT_SYS_MODULE_PATH_AIX ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # -bexpall does not export symbols beginning with underscore (_) +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' ' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- # see comment about different semantics on the GNU ld section +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='' ++ ;; ++ m68k) ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac + ;; + +- bsdi4*) +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ++ bsdi[[45]]*) ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext=".dll" ++ shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path='`cygpath -w "$srcfile"`' +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + darwin* | rhapsody*) +- if test "$GXX" = yes ; then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- case "$host_os" in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- lt_int_apple_cc_single_mod=no +- output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes +- fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi ++ _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + freebsd1*) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor +@@ -5425,91 +4748,106 @@ + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ freebsd* | dragonfly*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + hpux9*) + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(hardcode_direct, $1)=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + +- hpux10* | hpux11*) ++ hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else +- case "$host_cpu" in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ++ case $host_cpu in ++ hppa*64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; +- ia64*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ *) ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- ;; +- *) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi +@@ -5517,236 +4855,290 @@ + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ # Try to use the -exported_symbol ld option, if it does not ++ # work, assume that -exports_file does not work either and ++ # implicitly export all symbols. ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ AC_LINK_IFELSE(int foo(void) {}, ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ ) ++ LDFLAGS="$save_LDFLAGS" + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(inherit_rpath, $1)=yes ++ _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out ++ netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + newsos6) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + ++ *nto* | *qnx*) ++ ;; ++ + openbsd*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ if test -f /usr/libexec/ld.so; then ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ else ++ case $host_os in ++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi + else +- case $host_os in +- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- ;; +- esac ++ _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + os2*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ ++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + +- sco3.2v5*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- ;; +- + solaris*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' ++ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++ wlarc='${wl}' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++ case `$CC -V 2>&1` in ++ *"Compilers 5.0"*) ++ wlarc='' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ++ ;; ++ *) ++ wlarc='${wl}' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ ;; ++ esac + fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) # Supported since Solaris 2.6 (maybe 2.5.1?) +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; ++ *) ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but is careful enough not to reorder. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++ fi ++ ;; + esac +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4) + case $host_vendor in + sni) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' ++ _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4.3*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; + +- sysv4.2uw2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- hardcode_runpath_var=yes +- runpath_var=LD_RUN_PATH ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi + ;; + +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi +- runpath_var='LD_RUN_PATH' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +- sysv5*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' +- # $CC -shared without GNU ld will not create a library from C++ +- # object files and a static libstdc++, better avoid it by now +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var='LD_RUN_PATH' ++ uts4*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +- uts4*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- + *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac ++ ++ if test x$host_vendor = xsni; then ++ case $host in ++ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' ++ ;; ++ esac ++ fi + fi + ]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +- +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi ++AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++ ++_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld ++ ++_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl ++_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl ++_LT_DECL([], [extract_expsyms_cmds], [2], ++ [The commands to extract the exported symbol list from a shared archive]) + + # + # Do we need to explicitly link libc? + # +-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in ++case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in + x|xyes) + # Assume -lc should be added +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then +- case $_LT_AC_TAGVAR(archive_cmds, $1) in ++ case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; +@@ -5755,118 +5147,1924 @@ + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_MSG_CHECKING([whether -lc should be explicitly linked in]) +- $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ $RM conftest* ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= +- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) ++ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest +- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)= +- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) ++ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) ++ _LT_TAGVAR(allow_undefined_flag, $1)= ++ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no + else +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi +- $rm conftest* +- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) ++ $RM conftest* ++ AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) + ;; + esac + fi + ;; + esac +-])# AC_LIBTOOL_PROG_LD_SHLIBS +- +- +-# _LT_AC_FILE_LTDLL_C +-# ------------------- +-# Be careful that the start marker always follows a newline. +-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ +-# /* ltdll.c starts here */ +-# #define WIN32_LEAN_AND_MEAN +-# #include +-# #undef WIN32_LEAN_AND_MEAN +-# #include +-# +-# #ifndef __CYGWIN__ +-# # ifdef __CYGWIN32__ +-# # define __CYGWIN__ __CYGWIN32__ +-# # endif +-# #endif +-# +-# #ifdef __cplusplus +-# extern "C" { +-# #endif +-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); +-# #ifdef __cplusplus +-# } +-# #endif +-# +-# #ifdef __CYGWIN__ +-# #include +-# DECLARE_CYGWIN_DLL( DllMain ); +-# #endif +-# HINSTANCE __hDllInstance_base; +-# +-# BOOL APIENTRY +-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) +-# { +-# __hDllInstance_base = hInst; +-# return TRUE; +-# } +-# /* ltdll.c ends here */ +-])# _LT_AC_FILE_LTDLL_C +- +- +-# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) ++ ++_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], ++ [Whether or not to add -lc for building shared libraries]) ++_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], ++ [enable_shared_with_static_runtimes], [0], ++ [Whether or not to disallow shared libs when runtime libs are static]) ++_LT_TAGDECL([], [export_dynamic_flag_spec], [1], ++ [Compiler flag to allow reflexive dlopens]) ++_LT_TAGDECL([], [whole_archive_flag_spec], [1], ++ [Compiler flag to generate shared objects directly from archives]) ++_LT_TAGDECL([], [compiler_needs_object], [1], ++ [Whether the compiler copes with passing no objects directly]) ++_LT_TAGDECL([], [old_archive_from_new_cmds], [2], ++ [Create an old-style archive from a shared archive]) ++_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], ++ [Create a temporary old-style archive to link instead of a shared archive]) ++_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) ++_LT_TAGDECL([], [archive_expsym_cmds], [2]) ++_LT_TAGDECL([], [module_cmds], [2], ++ [Commands used to build a loadable module if different from building ++ a shared archive.]) ++_LT_TAGDECL([], [module_expsym_cmds], [2]) ++_LT_TAGDECL([], [with_gnu_ld], [1], ++ [Whether we are building with GNU ld or not]) ++_LT_TAGDECL([], [allow_undefined_flag], [1], ++ [Flag that allows shared libraries with undefined symbols to be built]) ++_LT_TAGDECL([], [no_undefined_flag], [1], ++ [Flag that enforces no undefined symbols]) ++_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], ++ [Flag to hardcode $libdir into a binary during linking. ++ This must work even if $libdir does not exist]) ++_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], ++ [[If ld is used when linking, flag to hardcode $libdir into a binary ++ during linking. This must work even if $libdir does not exist]]) ++_LT_TAGDECL([], [hardcode_libdir_separator], [1], ++ [Whether we need a single "-rpath" flag with a separated argument]) ++_LT_TAGDECL([], [hardcode_direct], [0], ++ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes ++ DIR into the resulting binary]) ++_LT_TAGDECL([], [hardcode_direct_absolute], [0], ++ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes ++ DIR into the resulting binary and the resulting library dependency is ++ "absolute", i.e impossible to change by setting ${shlibpath_var} if the ++ library is relocated]) ++_LT_TAGDECL([], [hardcode_minus_L], [0], ++ [Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++ into the resulting binary]) ++_LT_TAGDECL([], [hardcode_shlibpath_var], [0], ++ [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR ++ into the resulting binary]) ++_LT_TAGDECL([], [hardcode_automatic], [0], ++ [Set to "yes" if building a shared library automatically hardcodes DIR ++ into the library and all subsequent libraries and executables linked ++ against it]) ++_LT_TAGDECL([], [inherit_rpath], [0], ++ [Set to yes if linker adds runtime paths of dependent libraries ++ to runtime path list]) ++_LT_TAGDECL([], [link_all_deplibs], [0], ++ [Whether libtool must link a program against all its dependency libraries]) ++_LT_TAGDECL([], [fix_srcfile_path], [1], ++ [Fix the shell variable $srcfile for the compiler]) ++_LT_TAGDECL([], [always_export_symbols], [0], ++ [Set to "yes" if exported symbols are required]) ++_LT_TAGDECL([], [export_symbols_cmds], [2], ++ [The commands to list exported symbols]) ++_LT_TAGDECL([], [exclude_expsyms], [1], ++ [Symbols that should not be listed in the preloaded symbols]) ++_LT_TAGDECL([], [include_expsyms], [1], ++ [Symbols that must always be exported]) ++_LT_TAGDECL([], [prelink_cmds], [2], ++ [Commands necessary for linking programs (against libraries) with templates]) ++_LT_TAGDECL([], [file_list_spec], [1], ++ [Specify filename containing input files]) ++dnl FIXME: Not yet implemented ++dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], ++dnl [Compiler flag to generate thread safe objects]) ++])# _LT_LINKER_SHLIBS ++ ++ ++# _LT_LANG_C_CONFIG([TAG]) ++# ------------------------ ++# Ensure that the configuration variables for a C compiler are suitably ++# defined. These variables are subsequently used by _LT_CONFIG to write ++# the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_C_CONFIG], ++[m4_require([_LT_DECL_EGREP])dnl ++lt_save_CC="$CC" ++AC_LANG_PUSH(C) ++ ++# Source file extension for C test sources. ++ac_ext=c ++ ++# Object file extension for compiled C test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="int some_variable = 0;" ++ ++# Code to be used in simple link tests ++lt_simple_link_test_code='int main(){return(0);}' ++ ++_LT_TAG_COMPILER ++# Save the default compiler, since it gets overwritten when the other ++# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. ++compiler_DEFAULT=$CC ++ ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++if test -n "$compiler"; then ++ _LT_COMPILER_NO_RTTI($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_SYS_DYNAMIC_LINKER($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ LT_SYS_DLOPEN_SELF ++ _LT_CMD_STRIPLIB ++ ++ # Report which library types will actually be built ++ AC_MSG_CHECKING([if libtool supports shared libraries]) ++ AC_MSG_RESULT([$can_build_shared]) ++ ++ AC_MSG_CHECKING([whether to build shared libraries]) ++ test "$can_build_shared" = "no" && enable_shared=no ++ ++ # On AIX, shared libraries and static libraries use the same namespace, and ++ # are all built from PIC. ++ case $host_os in ++ aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++ ++ aix[[4-9]]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++ esac ++ AC_MSG_RESULT([$enable_shared]) ++ ++ AC_MSG_CHECKING([whether to build static libraries]) ++ # Make sure either enable_shared or enable_static is yes. ++ test "$enable_shared" = yes || enable_static=yes ++ AC_MSG_RESULT([$enable_static]) ++ ++ _LT_CONFIG($1) ++fi ++AC_LANG_POP ++CC="$lt_save_CC" ++])# _LT_LANG_C_CONFIG ++ ++ ++# _LT_PROG_CXX ++# ------------ ++# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ ++# compiler, we have our own version here. ++m4_defun([_LT_PROG_CXX], ++[ ++pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) ++AC_PROG_CXX ++if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_PROG_CXXCPP ++else ++ _lt_caught_CXX_error=yes ++fi ++popdef([AC_MSG_ERROR]) ++])# _LT_PROG_CXX ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([_LT_PROG_CXX], []) ++ ++ ++# _LT_LANG_CXX_CONFIG([TAG]) ++# -------------------------- ++# Ensure that the configuration variables for a C++ compiler are suitably ++# defined. These variables are subsequently used by _LT_CONFIG to write ++# the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_CXX_CONFIG], ++[AC_REQUIRE([_LT_PROG_CXX])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_EGREP])dnl ++ ++AC_LANG_PUSH(C++) ++_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_TAGVAR(allow_undefined_flag, $1)= ++_LT_TAGVAR(always_export_symbols, $1)=no ++_LT_TAGVAR(archive_expsym_cmds, $1)= ++_LT_TAGVAR(compiler_needs_object, $1)=no ++_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_TAGVAR(hardcode_direct, $1)=no ++_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_TAGVAR(hardcode_minus_L, $1)=no ++_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++_LT_TAGVAR(hardcode_automatic, $1)=no ++_LT_TAGVAR(inherit_rpath, $1)=no ++_LT_TAGVAR(module_cmds, $1)= ++_LT_TAGVAR(module_expsym_cmds, $1)= ++_LT_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(no_undefined_flag, $1)= ++_LT_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ ++# Source file extension for C++ test sources. ++ac_ext=cpp ++ ++# Object file extension for compiled C++ test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# No sense in running all these tests if we already determined that ++# the CXX compiler isn't working. Some variables (like enable_shared) ++# are currently assumed to apply to all compilers on this platform, ++# and will be corrupted by setting them based on a non-working compiler. ++if test "$_lt_caught_CXX_error" != yes; then ++ # Code to be used in simple compile tests ++ lt_simple_compile_test_code="int some_variable = 0;" ++ ++ # Code to be used in simple link tests ++ lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' ++ ++ # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ _LT_TAG_COMPILER ++ ++ # save warnings/boilerplate of simple test code ++ _LT_COMPILER_BOILERPLATE ++ _LT_LINKER_BOILERPLATE ++ ++ # Allow CC to be a program name with arguments. ++ lt_save_CC=$CC ++ lt_save_LD=$LD ++ lt_save_GCC=$GCC ++ GCC=$GXX ++ lt_save_with_gnu_ld=$with_gnu_ld ++ lt_save_path_LD=$lt_cv_path_LD ++ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++ else ++ $as_unset lt_cv_prog_gnu_ld ++ fi ++ if test -n "${lt_cv_path_LDCXX+set}"; then ++ lt_cv_path_LD=$lt_cv_path_LDCXX ++ else ++ $as_unset lt_cv_path_LD ++ fi ++ test -z "${LDCXX+set}" || LD=$LDCXX ++ CC=${CXX-"c++"} ++ compiler=$CC ++ _LT_TAGVAR(compiler, $1)=$CC ++ _LT_CC_BASENAME([$compiler]) ++ ++ if test -n "$compiler"; then ++ # We don't want -fno-exception when compiling C++ code, so set the ++ # no_builtin_flag separately ++ if test "$GXX" = yes; then ++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++ else ++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++ fi ++ ++ if test "$GXX" = yes; then ++ # Set up default GNU C++ configuration ++ ++ LT_PATH_LD ++ ++ # Check if GNU C++ uses GNU ld as the underlying linker, since the ++ # archiving commands below assume that GNU ld is being used. ++ if test "$with_gnu_ld" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++ # investigate it a little bit more. (MM) ++ wlarc='${wl}' ++ ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if eval "`$CC -print-prog-name=ld` --help 2>&1" | ++ $GREP 'no-whole-archive' > /dev/null; then ++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ else ++ with_gnu_ld=no ++ wlarc= ++ ++ # A generic and very simple default shared library creation ++ # command for GNU C++ for the case where it uses the native ++ # linker, instead of GNU ld. If possible, this setting should ++ # overridden to take advantage of the native linker features on ++ # the platform it is being used on. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ fi ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ ++ else ++ GXX=no ++ with_gnu_ld=no ++ wlarc= ++ fi ++ ++ # PORTME: fill in a description of your system's C++ link characteristics ++ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++ _LT_TAGVAR(ld_shlibs, $1)=yes ++ case $host_os in ++ aix3*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aix[[4-9]]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) ++ for ld_flag in $LDFLAGS; do ++ case $ld_flag in ++ *-brtl*) ++ aix_use_runtimelinking=yes ++ break ++ ;; ++ esac ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ _LT_TAGVAR(archive_cmds, $1)='' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' ++ ++ if test "$GXX" = yes; then ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && ++ strings "$collect2name" | $GREP resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ _LT_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)= ++ fi ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi ++ ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to ++ # export. ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an empty ++ # executable. ++ _LT_SYS_MODULE_PATH_AIX ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ _LT_SYS_MODULE_PATH_AIX ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared ++ # libraries. ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ chorus*) ++ case $cc_basename in ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ ++ cygwin* | mingw* | pw32* | cegcc*) ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ darwin* | rhapsody*) ++ _LT_DARWIN_LINKER_FEATURES($1) ++ ;; ++ ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ ++ freebsd[[12]]*) ++ # C++ shared libraries reported to be fairly broken before ++ # switch to ELF ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ freebsd-elf*) ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ ;; ++ ++ freebsd* | dragonfly*) ++ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++ # conventions ++ _LT_TAGVAR(ld_shlibs, $1)=yes ++ ;; ++ ++ gnu*) ++ ;; ++ ++ hpux9*) ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ hpux10*|hpux11*) ++ if test $with_gnu_ld = no; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ ;; ++ *) ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; ++ esac ++ fi ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ;; ++ esac ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ case $host_cpu in ++ hppa*64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test $with_gnu_ld = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ fi ++ else ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ interix[[3-9]]*) ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ irix5* | irix6*) ++ case $cc_basename in ++ CC*) ++ # SGI C++ ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' ++ fi ++ fi ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ esac ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(inherit_rpath, $1)=yes ++ ;; ++ ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++ ;; ++ icpc* | ecpc* ) ++ # Intel C++ ++ with_gnu_ld=yes ++ # version 8.0 and above of icpc choke on multiply defined symbols ++ # if we add $predep_objects and $postdep_objects, however 7.1 and ++ # earlier do not add the objects themselves. ++ case `$CC -V 2>&1` in ++ *"Version 7."*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 8.0 or newer ++ tmp_idyn= ++ case $host_cpu in ++ ia64*) tmp_idyn=' -i_dynamic';; ++ esac ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler ++ case `$CC -V` in ++ *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) ++ _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ ++ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' ++ _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ ++ $RANLIB $oldlib' ++ _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ;; ++ *) # Version 6 will use weak symbols ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ;; ++ esac ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ ;; ++ cxx*) ++ # Compaq C++ ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++ ++ runpath_var=LD_RUN_PATH ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ xl*) ++ # IBM XL 8.0 on PPC, with GNU ld ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ if test "x$supports_anon_versioning" = xyes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(compiler_needs_object, $1)=yes ++ ++ # Not sure whether something based on ++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 ++ # would be better. ++ output_verbose_link_cmd='echo' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ ++ lynxos*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ m88k*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' ++ wlarc= ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ fi ++ # Workaround some broken pre-1.5 toolchains ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ ;; ++ ++ *nto* | *qnx*) ++ _LT_TAGVAR(ld_shlibs, $1)=yes ++ ;; ++ ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ openbsd*) ++ if test -f /usr/libexec/ld.so; then ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd=echo ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Archives containing C++ object files must be created using ++ # the KAI C++ compiler. ++ case $host in ++ osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; ++ *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; ++ esac ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ cxx*) ++ case $host in ++ osf3*) ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ ;; ++ *) ++ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++ echo "-hidden">> $lib.exp~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ ++ $RM $lib.exp' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ ;; ++ esac ++ ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ case $host in ++ osf3*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ;; ++ esac ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ ++ else ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ psos*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ lcc*) ++ # Lucid ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes ++ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++ ;; ++ esac ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ ++ output_verbose_link_cmd='echo' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ ++ # The C++ compiler must be used to create the archive. ++ _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++ ;; ++ *) ++ # GNU C++ compiler with Solaris linker ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' ++ if $CC --version | $GREP -v '^2\.7' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ else ++ # g++ 2.7 appears to require `-G' NOT `-shared' on this ++ # platform. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ fi ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ ;; ++ ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ ++ vxworks*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ++ AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) ++ test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++ ++ _LT_TAGVAR(GCC, $1)="$GXX" ++ _LT_TAGVAR(LD, $1)="$LD" ++ ++ ## CAVEAT EMPTOR: ++ ## There is no encapsulation within the following macros, do not change ++ ## the running order or otherwise move them around unless you know exactly ++ ## what you are doing... ++ _LT_SYS_HIDDEN_LIBDEPS($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_SYS_DYNAMIC_LINKER($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++ fi # test -n "$compiler" ++ ++ CC=$lt_save_CC ++ LDCXX=$LD ++ LD=$lt_save_LD ++ GCC=$lt_save_GCC ++ with_gnu_ld=$lt_save_with_gnu_ld ++ lt_cv_path_LDCXX=$lt_cv_path_LD ++ lt_cv_path_LD=$lt_save_path_LD ++ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++fi # test "$_lt_caught_CXX_error" != yes ++ ++AC_LANG_POP ++])# _LT_LANG_CXX_CONFIG ++ ++ ++# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) + # --------------------------------- +-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) +- +- +-# old names +-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) +-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +-AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) +-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) +- +-# This is just to silence aclocal about the macro not being used +-ifelse([AC_DISABLE_FAST_INSTALL]) +- +-AC_DEFUN([LT_AC_PROG_GCJ], +-[AC_CHECK_TOOL(GCJ, gcj, no) +- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" +- AC_SUBST(GCJFLAGS) ++# Figure out "hidden" library dependencies from verbose ++# compiler output when linking a shared library. ++# Parse the compiler output and extract the necessary ++# objects, libraries and library flags. ++m4_defun([_LT_SYS_HIDDEN_LIBDEPS], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++# Dependencies to place before and after the object being linked: ++_LT_TAGVAR(predep_objects, $1)= ++_LT_TAGVAR(postdep_objects, $1)= ++_LT_TAGVAR(predeps, $1)= ++_LT_TAGVAR(postdeps, $1)= ++_LT_TAGVAR(compiler_lib_search_path, $1)= ++ ++dnl we can't use the lt_simple_compile_test_code here, ++dnl because it contains code intended for an executable, ++dnl not a library. It's possible we should let each ++dnl tag define a new lt_????_link_test_code variable, ++dnl but it's only used here... ++m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF ++int a; ++void foo (void) { a = 0; } ++_LT_EOF ++], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF ++class Foo ++{ ++public: ++ Foo (void) { a = 0; } ++private: ++ int a; ++}; ++_LT_EOF ++], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF ++ subroutine foo ++ implicit none ++ integer*4 a ++ a=0 ++ return ++ end ++_LT_EOF ++], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF ++ subroutine foo ++ implicit none ++ integer a ++ a=0 ++ return ++ end ++_LT_EOF ++], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF ++public class foo { ++ private int a; ++ public void bar (void) { ++ a = 0; ++ } ++}; ++_LT_EOF + ]) +- +-AC_DEFUN([LT_AC_PROG_RC], +-[AC_CHECK_TOOL(RC, windres, no) ++dnl Parse the compiler output and extract the necessary ++dnl objects, libraries and library flags. ++if AC_TRY_EVAL(ac_compile); then ++ # Parse the compiler output and extract the necessary ++ # objects, libraries and library flags. ++ ++ # Sentinel used to keep track of whether or not we are before ++ # the conftest object file. ++ pre_test_object_deps_done=no ++ ++ for p in `eval "$output_verbose_link_cmd"`; do ++ case $p in ++ ++ -L* | -R* | -l*) ++ # Some compilers place space between "-{L,R}" and the path. ++ # Remove the space. ++ if test $p = "-L" || ++ test $p = "-R"; then ++ prev=$p ++ continue ++ else ++ prev= ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ case $p in ++ -L* | -R*) ++ # Internal compiler library paths should come after those ++ # provided the user. The postdeps already come after the ++ # user supplied libs so there is no need to process them. ++ if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then ++ _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" ++ else ++ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" ++ fi ++ ;; ++ # The "-l" case would never come before the object being ++ # linked, so don't bother handling this case. ++ esac ++ else ++ if test -z "$_LT_TAGVAR(postdeps, $1)"; then ++ _LT_TAGVAR(postdeps, $1)="${prev}${p}" ++ else ++ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" ++ fi ++ fi ++ ;; ++ ++ *.$objext) ++ # This assumes that the test object file only shows up ++ # once in the compiler output. ++ if test "$p" = "conftest.$objext"; then ++ pre_test_object_deps_done=yes ++ continue ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ if test -z "$_LT_TAGVAR(predep_objects, $1)"; then ++ _LT_TAGVAR(predep_objects, $1)="$p" ++ else ++ _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" ++ fi ++ else ++ if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then ++ _LT_TAGVAR(postdep_objects, $1)="$p" ++ else ++ _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" ++ fi ++ fi ++ ;; ++ ++ *) ;; # Ignore the rest. ++ ++ esac ++ done ++ ++ # Clean up. ++ rm -f a.out a.exe ++else ++ echo "libtool.m4: error: problem compiling $1 test program" ++fi ++ ++$RM -f confest.$objext ++ ++# PORTME: override above test on systems where it is broken ++m4_if([$1], [CXX], ++[case $host_os in ++interix[[3-9]]*) ++ # Interix 3.5 installs completely hosed .la files for C++, so rather than ++ # hack all around it, let's just trust "g++" to DTRT. ++ _LT_TAGVAR(predep_objects,$1)= ++ _LT_TAGVAR(postdep_objects,$1)= ++ _LT_TAGVAR(postdeps,$1)= ++ ;; ++ ++linux*) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++ ++solaris*) ++ case $cc_basename in ++ CC*) ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ ++ # Adding this requires a known-good setup of shared libraries for ++ # Sun compiler versions before 5.6, else PIC objects from an old ++ # archive will be linked into the output, leading to subtle bugs. ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++esac + ]) + ++case " $_LT_TAGVAR(postdeps, $1) " in ++*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; ++esac ++ _LT_TAGVAR(compiler_lib_search_dirs, $1)= ++if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then ++ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++fi ++_LT_TAGDECL([], [compiler_lib_search_dirs], [1], ++ [The directories searched by this compiler when creating a shared library]) ++_LT_TAGDECL([], [predep_objects], [1], ++ [Dependencies to place before and after the objects being linked to ++ create a shared library]) ++_LT_TAGDECL([], [postdep_objects], [1]) ++_LT_TAGDECL([], [predeps], [1]) ++_LT_TAGDECL([], [postdeps], [1]) ++_LT_TAGDECL([], [compiler_lib_search_path], [1], ++ [The library search path used internally by the compiler when linking ++ a shared library]) ++])# _LT_SYS_HIDDEN_LIBDEPS ++ ++ ++# _LT_PROG_F77 ++# ------------ ++# Since AC_PROG_F77 is broken, in that it returns the empty string ++# if there is no fortran compiler, we have our own version here. ++m4_defun([_LT_PROG_F77], ++[ ++pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) ++AC_PROG_F77 ++if test -z "$F77" || test "X$F77" = "Xno"; then ++ _lt_disable_F77=yes ++fi ++popdef([AC_MSG_ERROR]) ++])# _LT_PROG_F77 ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([_LT_PROG_F77], []) ++ ++ ++# _LT_LANG_F77_CONFIG([TAG]) ++# -------------------------- ++# Ensure that the configuration variables for a Fortran 77 compiler are ++# suitably defined. These variables are subsequently used by _LT_CONFIG ++# to write the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_F77_CONFIG], ++[AC_REQUIRE([_LT_PROG_F77])dnl ++AC_LANG_PUSH(Fortran 77) ++ ++_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_TAGVAR(allow_undefined_flag, $1)= ++_LT_TAGVAR(always_export_symbols, $1)=no ++_LT_TAGVAR(archive_expsym_cmds, $1)= ++_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_TAGVAR(hardcode_direct, $1)=no ++_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_TAGVAR(hardcode_minus_L, $1)=no ++_LT_TAGVAR(hardcode_automatic, $1)=no ++_LT_TAGVAR(inherit_rpath, $1)=no ++_LT_TAGVAR(module_cmds, $1)= ++_LT_TAGVAR(module_expsym_cmds, $1)= ++_LT_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(no_undefined_flag, $1)= ++_LT_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ ++# Source file extension for f77 test sources. ++ac_ext=f ++ ++# Object file extension for compiled f77 test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# No sense in running all these tests if we already determined that ++# the F77 compiler isn't working. Some variables (like enable_shared) ++# are currently assumed to apply to all compilers on this platform, ++# and will be corrupted by setting them based on a non-working compiler. ++if test "$_lt_disable_F77" != yes; then ++ # Code to be used in simple compile tests ++ lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" ++ ++ # Code to be used in simple link tests ++ lt_simple_link_test_code="\ ++ program t ++ end ++" ++ ++ # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ _LT_TAG_COMPILER ++ ++ # save warnings/boilerplate of simple test code ++ _LT_COMPILER_BOILERPLATE ++ _LT_LINKER_BOILERPLATE ++ ++ # Allow CC to be a program name with arguments. ++ lt_save_CC="$CC" ++ lt_save_GCC=$GCC ++ CC=${F77-"f77"} ++ compiler=$CC ++ _LT_TAGVAR(compiler, $1)=$CC ++ _LT_CC_BASENAME([$compiler]) ++ GCC=$G77 ++ if test -n "$compiler"; then ++ AC_MSG_CHECKING([if libtool supports shared libraries]) ++ AC_MSG_RESULT([$can_build_shared]) ++ ++ AC_MSG_CHECKING([whether to build shared libraries]) ++ test "$can_build_shared" = "no" && enable_shared=no ++ ++ # On AIX, shared libraries and static libraries use the same namespace, and ++ # are all built from PIC. ++ case $host_os in ++ aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++ aix[[4-9]]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++ esac ++ AC_MSG_RESULT([$enable_shared]) ++ ++ AC_MSG_CHECKING([whether to build static libraries]) ++ # Make sure either enable_shared or enable_static is yes. ++ test "$enable_shared" = yes || enable_static=yes ++ AC_MSG_RESULT([$enable_static]) ++ ++ _LT_TAGVAR(GCC, $1)="$G77" ++ _LT_TAGVAR(LD, $1)="$LD" ++ ++ ## CAVEAT EMPTOR: ++ ## There is no encapsulation within the following macros, do not change ++ ## the running order or otherwise move them around unless you know exactly ++ ## what you are doing... ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_SYS_DYNAMIC_LINKER($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++ fi # test -n "$compiler" ++ ++ GCC=$lt_save_GCC ++ CC="$lt_save_CC" ++fi # test "$_lt_disable_F77" != yes ++ ++AC_LANG_POP ++])# _LT_LANG_F77_CONFIG ++ ++ ++# _LT_PROG_FC ++# ----------- ++# Since AC_PROG_FC is broken, in that it returns the empty string ++# if there is no fortran compiler, we have our own version here. ++m4_defun([_LT_PROG_FC], ++[ ++pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) ++AC_PROG_FC ++if test -z "$FC" || test "X$FC" = "Xno"; then ++ _lt_disable_FC=yes ++fi ++popdef([AC_MSG_ERROR]) ++])# _LT_PROG_FC ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([_LT_PROG_FC], []) ++ ++ ++# _LT_LANG_FC_CONFIG([TAG]) ++# ------------------------- ++# Ensure that the configuration variables for a Fortran compiler are ++# suitably defined. These variables are subsequently used by _LT_CONFIG ++# to write the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_FC_CONFIG], ++[AC_REQUIRE([_LT_PROG_FC])dnl ++AC_LANG_PUSH(Fortran) ++ ++_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_TAGVAR(allow_undefined_flag, $1)= ++_LT_TAGVAR(always_export_symbols, $1)=no ++_LT_TAGVAR(archive_expsym_cmds, $1)= ++_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_TAGVAR(hardcode_direct, $1)=no ++_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_TAGVAR(hardcode_minus_L, $1)=no ++_LT_TAGVAR(hardcode_automatic, $1)=no ++_LT_TAGVAR(inherit_rpath, $1)=no ++_LT_TAGVAR(module_cmds, $1)= ++_LT_TAGVAR(module_expsym_cmds, $1)= ++_LT_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(no_undefined_flag, $1)= ++_LT_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ ++# Source file extension for fc test sources. ++ac_ext=${ac_fc_srcext-f} ++ ++# Object file extension for compiled fc test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# No sense in running all these tests if we already determined that ++# the FC compiler isn't working. Some variables (like enable_shared) ++# are currently assumed to apply to all compilers on this platform, ++# and will be corrupted by setting them based on a non-working compiler. ++if test "$_lt_disable_FC" != yes; then ++ # Code to be used in simple compile tests ++ lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" ++ ++ # Code to be used in simple link tests ++ lt_simple_link_test_code="\ ++ program t ++ end ++" ++ ++ # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ _LT_TAG_COMPILER ++ ++ # save warnings/boilerplate of simple test code ++ _LT_COMPILER_BOILERPLATE ++ _LT_LINKER_BOILERPLATE ++ ++ # Allow CC to be a program name with arguments. ++ lt_save_CC="$CC" ++ lt_save_GCC=$GCC ++ CC=${FC-"f95"} ++ compiler=$CC ++ GCC=$ac_cv_fc_compiler_gnu ++ ++ _LT_TAGVAR(compiler, $1)=$CC ++ _LT_CC_BASENAME([$compiler]) ++ ++ if test -n "$compiler"; then ++ AC_MSG_CHECKING([if libtool supports shared libraries]) ++ AC_MSG_RESULT([$can_build_shared]) ++ ++ AC_MSG_CHECKING([whether to build shared libraries]) ++ test "$can_build_shared" = "no" && enable_shared=no ++ ++ # On AIX, shared libraries and static libraries use the same namespace, and ++ # are all built from PIC. ++ case $host_os in ++ aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++ aix[[4-9]]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++ esac ++ AC_MSG_RESULT([$enable_shared]) ++ ++ AC_MSG_CHECKING([whether to build static libraries]) ++ # Make sure either enable_shared or enable_static is yes. ++ test "$enable_shared" = yes || enable_static=yes ++ AC_MSG_RESULT([$enable_static]) ++ ++ _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" ++ _LT_TAGVAR(LD, $1)="$LD" ++ ++ ## CAVEAT EMPTOR: ++ ## There is no encapsulation within the following macros, do not change ++ ## the running order or otherwise move them around unless you know exactly ++ ## what you are doing... ++ _LT_SYS_HIDDEN_LIBDEPS($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_SYS_DYNAMIC_LINKER($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++ fi # test -n "$compiler" ++ ++ GCC=$lt_save_GCC ++ CC="$lt_save_CC" ++fi # test "$_lt_disable_FC" != yes ++ ++AC_LANG_POP ++])# _LT_LANG_FC_CONFIG ++ ++ ++# _LT_LANG_GCJ_CONFIG([TAG]) ++# -------------------------- ++# Ensure that the configuration variables for the GNU Java Compiler compiler ++# are suitably defined. These variables are subsequently used by _LT_CONFIG ++# to write the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_GCJ_CONFIG], ++[AC_REQUIRE([LT_PROG_GCJ])dnl ++AC_LANG_SAVE ++ ++# Source file extension for Java test sources. ++ac_ext=java ++ ++# Object file extension for compiled Java test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="class foo {}" ++ ++# Code to be used in simple link tests ++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' ++ ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_TAG_COMPILER ++ ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++lt_save_GCC=$GCC ++GCC=yes ++CC=${GCJ-"gcj"} ++compiler=$CC ++_LT_TAGVAR(compiler, $1)=$CC ++_LT_TAGVAR(LD, $1)="$LD" ++_LT_CC_BASENAME([$compiler]) ++ ++# GCJ did not exist at the time GCC didn't implicitly link libc in. ++_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ ++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++ ++if test -n "$compiler"; then ++ _LT_COMPILER_NO_RTTI($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++fi ++ ++AC_LANG_RESTORE ++ ++GCC=$lt_save_GCC ++CC="$lt_save_CC" ++])# _LT_LANG_GCJ_CONFIG ++ ++ ++# _LT_LANG_RC_CONFIG([TAG]) ++# ------------------------- ++# Ensure that the configuration variables for the Windows resource compiler ++# are suitably defined. These variables are subsequently used by _LT_CONFIG ++# to write the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_RC_CONFIG], ++[AC_REQUIRE([LT_PROG_RC])dnl ++AC_LANG_SAVE ++ ++# Source file extension for RC test sources. ++ac_ext=rc ++ ++# Object file extension for compiled RC test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# Code to be used in simple compile tests ++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' ++ ++# Code to be used in simple link tests ++lt_simple_link_test_code="$lt_simple_compile_test_code" ++ ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_TAG_COMPILER ++ ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++lt_save_GCC=$GCC ++GCC= ++CC=${RC-"windres"} ++compiler=$CC ++_LT_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) ++_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ ++if test -n "$compiler"; then ++ : ++ _LT_CONFIG($1) ++fi ++ ++GCC=$lt_save_GCC ++AC_LANG_RESTORE ++CC="$lt_save_CC" ++])# _LT_LANG_RC_CONFIG ++ ++ ++# LT_PROG_GCJ ++# ----------- ++AC_DEFUN([LT_PROG_GCJ], ++[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], ++ [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], ++ [AC_CHECK_TOOL(GCJ, gcj,) ++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++ AC_SUBST(GCJFLAGS)])])[]dnl ++]) ++ ++# Old name: ++AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([LT_AC_PROG_GCJ], []) ++ ++ ++# LT_PROG_RC ++# ---------- ++AC_DEFUN([LT_PROG_RC], ++[AC_CHECK_TOOL(RC, windres,) ++]) ++ ++# Old name: ++AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([LT_AC_PROG_RC], []) ++ ++ ++# _LT_DECL_EGREP ++# -------------- ++# If we don't have a new enough Autoconf to choose the best grep ++# available, choose the one first in the user's PATH. ++m4_defun([_LT_DECL_EGREP], ++[AC_REQUIRE([AC_PROG_EGREP])dnl ++AC_REQUIRE([AC_PROG_FGREP])dnl ++test -z "$GREP" && GREP=grep ++_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) ++_LT_DECL([], [EGREP], [1], [An ERE matcher]) ++_LT_DECL([], [FGREP], [1], [A literal string matcher]) ++dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too ++AC_SUBST([GREP]) ++]) ++ ++ ++# _LT_DECL_OBJDUMP ++# -------------- ++# If we don't have a new enough Autoconf to choose the best objdump ++# available, choose the one first in the user's PATH. ++m4_defun([_LT_DECL_OBJDUMP], ++[AC_CHECK_TOOL(OBJDUMP, objdump, false) ++test -z "$OBJDUMP" && OBJDUMP=objdump ++_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) ++AC_SUBST([OBJDUMP]) ++]) ++ ++ ++# _LT_DECL_SED ++# ------------ ++# Check for a fully-functional sed program, that truncates ++# as few characters as possible. Prefer GNU sed if found. ++m4_defun([_LT_DECL_SED], ++[AC_PROG_SED ++test -z "$SED" && SED=sed ++Xsed="$SED -e 1s/^X//" ++_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) ++_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], ++ [Sed that helps us avoid accidentally triggering echo(1) options like -n]) ++])# _LT_DECL_SED ++ ++m4_ifndef([AC_PROG_SED], [ + # NOTE: This macro has been submitted for inclusion into # + # GNU Autoconf as AC_PROG_SED. When it is available in # + # a released version of Autoconf we should remove this # + # macro and use it instead. # +-# LT_AC_PROG_SED +-# -------------- +-# Check for a fully-functional sed program, that truncates +-# as few characters as possible. Prefer GNU sed if found. +-AC_DEFUN([LT_AC_PROG_SED], ++ ++m4_defun([AC_PROG_SED], + [AC_MSG_CHECKING([for a sed that does not truncate output]) + AC_CACHE_VAL(lt_cv_path_SED, + [# Loop through the user's path and test for sed and gsed. +@@ -5884,12 +7082,13 @@ + done + done + done ++IFS=$as_save_IFS + lt_ac_max=0 + lt_ac_count=0 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris + # along with /bin/sed that truncates output. + for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do +- test ! -f $lt_ac_sed && break ++ test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in +@@ -5914,60 +7113,921 @@ + fi + done + done ++]) + SED=$lt_cv_path_SED ++AC_SUBST([SED]) ++AC_MSG_RESULT([$SED]) ++])#AC_PROG_SED ++])#m4_ifndef ++ ++# Old name: ++AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([LT_AC_PROG_SED], []) ++ ++ ++# _LT_CHECK_SHELL_FEATURES ++# ------------------------ ++# Find out whether the shell is Bourne or XSI compatible, ++# or has some other useful features. ++m4_defun([_LT_CHECK_SHELL_FEATURES], ++[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) ++# Try some XSI features ++xsi_shell=no ++( _lt_dummy="a/b/c" ++ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,, \ ++ && eval 'test $(( 1 + 1 )) -eq 2 \ ++ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ ++ && xsi_shell=yes ++AC_MSG_RESULT([$xsi_shell]) ++_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) ++ ++AC_MSG_CHECKING([whether the shell understands "+="]) ++lt_shell_append=no ++( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ ++ >/dev/null 2>&1 \ ++ && lt_shell_append=yes ++AC_MSG_RESULT([$lt_shell_append]) ++_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) ++ ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ lt_unset=unset ++else ++ lt_unset=false ++fi ++_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl ++ ++# test EBCDIC or ASCII ++case `echo X|tr X '\101'` in ++ A) # ASCII based system ++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr ++ lt_SP2NL='tr \040 \012' ++ lt_NL2SP='tr \015\012 \040\040' ++ ;; ++ *) # EBCDIC based system ++ lt_SP2NL='tr \100 \n' ++ lt_NL2SP='tr \r\n \100\100' ++ ;; ++esac ++_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl ++_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ++])# _LT_CHECK_SHELL_FEATURES ++ ++ ++# _LT_PROG_XSI_SHELLFNS ++# --------------------- ++# Bourne and XSI compatible variants of some useful shell functions. ++m4_defun([_LT_PROG_XSI_SHELLFNS], ++[case $xsi_shell in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result="${1##*/}" ++} ++ ++# func_dirname_and_basename file append nondir_replacement ++# perform func_basename and func_dirname in a single function ++# call: ++# dirname: Compute the dirname of FILE. If nonempty, ++# add APPEND to the result, otherwise set result ++# to NONDIR_REPLACEMENT. ++# value returned in "$func_dirname_result" ++# basename: Compute filename of FILE. ++# value retuned in "$func_basename_result" ++# Implementation must be kept synchronized with func_dirname ++# and func_basename. For efficiency, we do not delegate to ++# those functions but instead duplicate the functionality here. ++func_dirname_and_basename () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}" ++} ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++func_stripname () ++{ ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"} ++} ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=${1%%=*} ++ func_opt_split_arg=${1#*=} ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=${1%.*}.lo ++} ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=$(( $[*] )) ++} ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=${#1} ++} ++ ++_LT_EOF ++ ;; ++ *) # Bourne compatible functions. ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` ++} ++ ++dnl func_dirname_and_basename ++dnl A portable version of this function is already defined in general.m4sh ++dnl so there is no need for it here. ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "X${3}" \ ++ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "X${3}" \ ++ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; ++ esac ++} ++ ++# sed scripts: ++my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' ++my_sed_long_arg='1s/^-[[^=]]*=//' ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` ++ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` ++} ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "$[@]"` ++} ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` ++} ++ ++_LT_EOF ++esac ++ ++case $lt_shell_append in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$[1]+=\$[2]" ++} ++_LT_EOF ++ ;; ++ *) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$[1]=\$$[1]\$[2]" ++} ++ ++_LT_EOF ++ ;; ++ esac + ]) +-AC_MSG_RESULT([$SED]) ++ ++# Helper functions for option handling. -*- Autoconf -*- ++# ++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gary V. Vaughan, 2004 ++# ++# 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. ++ ++# serial 6 ltoptions.m4 ++ ++# This is to help aclocal find these macros, as it can't see m4_define. ++AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) ++ ++ ++# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) ++# ------------------------------------------ ++m4_define([_LT_MANGLE_OPTION], ++[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) ++ ++ ++# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) ++# --------------------------------------- ++# Set option OPTION-NAME for macro MACRO-NAME, and if there is a ++# matching handler defined, dispatch to it. Other OPTION-NAMEs are ++# saved as a flag. ++m4_define([_LT_SET_OPTION], ++[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl ++m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), ++ _LT_MANGLE_DEFUN([$1], [$2]), ++ [m4_warning([Unknown $1 option `$2'])])[]dnl + ]) + +-# -*- Autoconf -*- +-# Copyright (C) 2002, 2003 Free Software Foundation, Inc. +-# Generated from amversion.in; do not edit by hand. +- +-# 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, 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 ++ ++# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------------------------ ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++m4_define([_LT_IF_OPTION], ++[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) ++ ++ ++# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) ++# ------------------------------------------------------- ++# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME ++# are set. ++m4_define([_LT_UNLESS_OPTIONS], ++[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), ++ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), ++ [m4_define([$0_found])])])[]dnl ++m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 ++])[]dnl ++]) ++ ++ ++# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) ++# ---------------------------------------- ++# OPTION-LIST is a space-separated list of Libtool options associated ++# with MACRO-NAME. If any OPTION has a matching handler declared with ++# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about ++# the unknown option and exit. ++m4_defun([_LT_SET_OPTIONS], ++[# Set options ++m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), ++ [_LT_SET_OPTION([$1], _LT_Option)]) ++ ++m4_if([$1],[LT_INIT],[ ++ dnl ++ dnl Simply set some default values (i.e off) if boolean options were not ++ dnl specified: ++ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no ++ ]) ++ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no ++ ]) ++ dnl ++ dnl If no reference was made to various pairs of opposing options, then ++ dnl we run the default mode handler for the pair. For example, if neither ++ dnl `shared' nor `disable-shared' was passed, we enable building of shared ++ dnl archives by default: ++ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) ++ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) ++ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) ++ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], ++ [_LT_ENABLE_FAST_INSTALL]) ++ ]) ++])# _LT_SET_OPTIONS ++ ++ ++ ++# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) ++# ----------------------------------------- ++m4_define([_LT_MANGLE_DEFUN], ++[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) ++ ++ ++# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) ++# ----------------------------------------------- ++m4_define([LT_OPTION_DEFINE], ++[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl ++])# LT_OPTION_DEFINE ++ ++ ++# dlopen ++# ------ ++LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes ++]) ++ ++AU_DEFUN([AC_LIBTOOL_DLOPEN], ++[_LT_SET_OPTION([LT_INIT], [dlopen]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `dlopen' option into LT_INIT's first parameter.]) ++]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) ++ ++ ++# win32-dll ++# --------- ++# Declare package support for building win32 dll's. ++LT_OPTION_DEFINE([LT_INIT], [win32-dll], ++[enable_win32_dll=yes ++ ++case $host in ++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) ++ AC_CHECK_TOOL(AS, as, false) ++ AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++ AC_CHECK_TOOL(OBJDUMP, objdump, false) ++ ;; ++esac ++ ++test -z "$AS" && AS=as ++_LT_DECL([], [AS], [0], [Assembler program])dnl ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl ++ ++test -z "$OBJDUMP" && OBJDUMP=objdump ++_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl ++])# win32-dll ++ ++AU_DEFUN([AC_LIBTOOL_WIN32_DLL], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++_LT_SET_OPTION([LT_INIT], [win32-dll]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `win32-dll' option into LT_INIT's first parameter.]) ++]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) ++ ++ ++# _LT_ENABLE_SHARED([DEFAULT]) ++# ---------------------------- ++# implement the --enable-shared flag, and supports the `shared' and ++# `disable-shared' LT_INIT options. ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++m4_define([_LT_ENABLE_SHARED], ++[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl ++AC_ARG_ENABLE([shared], ++ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], ++ [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_shared=yes ;; ++ no) enable_shared=no ;; ++ *) ++ enable_shared=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_shared=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) ++ ++ _LT_DECL([build_libtool_libs], [enable_shared], [0], ++ [Whether or not to build shared libraries]) ++])# _LT_ENABLE_SHARED ++ ++LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) ++LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) ++ ++# Old names: ++AC_DEFUN([AC_ENABLE_SHARED], ++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) ++]) ++ ++AC_DEFUN([AC_DISABLE_SHARED], ++[_LT_SET_OPTION([LT_INIT], [disable-shared]) ++]) ++ ++AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AM_ENABLE_SHARED], []) ++dnl AC_DEFUN([AM_DISABLE_SHARED], []) ++ ++ ++ ++# _LT_ENABLE_STATIC([DEFAULT]) ++# ---------------------------- ++# implement the --enable-static flag, and support the `static' and ++# `disable-static' LT_INIT options. ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++m4_define([_LT_ENABLE_STATIC], ++[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl ++AC_ARG_ENABLE([static], ++ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], ++ [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_static=yes ;; ++ no) enable_static=no ;; ++ *) ++ enable_static=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_static=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_static=]_LT_ENABLE_STATIC_DEFAULT) ++ ++ _LT_DECL([build_old_libs], [enable_static], [0], ++ [Whether or not to build static libraries]) ++])# _LT_ENABLE_STATIC ++ ++LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) ++LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) ++ ++# Old names: ++AC_DEFUN([AC_ENABLE_STATIC], ++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) ++]) ++ ++AC_DEFUN([AC_DISABLE_STATIC], ++[_LT_SET_OPTION([LT_INIT], [disable-static]) ++]) ++ ++AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AM_ENABLE_STATIC], []) ++dnl AC_DEFUN([AM_DISABLE_STATIC], []) ++ ++ ++ ++# _LT_ENABLE_FAST_INSTALL([DEFAULT]) ++# ---------------------------------- ++# implement the --enable-fast-install flag, and support the `fast-install' ++# and `disable-fast-install' LT_INIT options. ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++m4_define([_LT_ENABLE_FAST_INSTALL], ++[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl ++AC_ARG_ENABLE([fast-install], ++ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], ++ [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_fast_install=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) ++ ++_LT_DECL([fast_install], [enable_fast_install], [0], ++ [Whether or not to optimize for fast installation])dnl ++])# _LT_ENABLE_FAST_INSTALL ++ ++LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) ++LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) ++ ++# Old names: ++AU_DEFUN([AC_ENABLE_FAST_INSTALL], ++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you put ++the `fast-install' option into LT_INIT's first parameter.]) ++]) ++ ++AU_DEFUN([AC_DISABLE_FAST_INSTALL], ++[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you put ++the `disable-fast-install' option into LT_INIT's first parameter.]) ++]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) ++dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) ++ ++ ++# _LT_WITH_PIC([MODE]) ++# -------------------- ++# implement the --with-pic flag, and support the `pic-only' and `no-pic' ++# LT_INIT options. ++# MODE is either `yes' or `no'. If omitted, it defaults to `both'. ++m4_define([_LT_WITH_PIC], ++[AC_ARG_WITH([pic], ++ [AS_HELP_STRING([--with-pic], ++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], ++ [pic_mode="$withval"], ++ [pic_mode=default]) ++ ++test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) ++ ++_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ++])# _LT_WITH_PIC ++ ++LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) ++LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) ++ ++# Old name: ++AU_DEFUN([AC_LIBTOOL_PICMODE], ++[_LT_SET_OPTION([LT_INIT], [pic-only]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `pic-only' option into LT_INIT's first parameter.]) ++]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) ++ ++ ++m4_define([_LTDL_MODE], []) ++LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], ++ [m4_define([_LTDL_MODE], [nonrecursive])]) ++LT_OPTION_DEFINE([LTDL_INIT], [recursive], ++ [m4_define([_LTDL_MODE], [recursive])]) ++LT_OPTION_DEFINE([LTDL_INIT], [subproject], ++ [m4_define([_LTDL_MODE], [subproject])]) ++ ++m4_define([_LTDL_TYPE], []) ++LT_OPTION_DEFINE([LTDL_INIT], [installable], ++ [m4_define([_LTDL_TYPE], [installable])]) ++LT_OPTION_DEFINE([LTDL_INIT], [convenience], ++ [m4_define([_LTDL_TYPE], [convenience])]) ++ ++# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- ++# ++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gary V. Vaughan, 2004 ++# ++# 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. ++ ++# serial 6 ltsugar.m4 ++ ++# This is to help aclocal find these macros, as it can't see m4_define. ++AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) ++ ++ ++# lt_join(SEP, ARG1, [ARG2...]) ++# ----------------------------- ++# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their ++# associated separator. ++# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier ++# versions in m4sugar had bugs. ++m4_define([lt_join], ++[m4_if([$#], [1], [], ++ [$#], [2], [[$2]], ++ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) ++m4_define([_lt_join], ++[m4_if([$#$2], [2], [], ++ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) ++ ++ ++# lt_car(LIST) ++# lt_cdr(LIST) ++# ------------ ++# Manipulate m4 lists. ++# These macros are necessary as long as will still need to support ++# Autoconf-2.59 which quotes differently. ++m4_define([lt_car], [[$1]]) ++m4_define([lt_cdr], ++[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], ++ [$#], 1, [], ++ [m4_dquote(m4_shift($@))])]) ++m4_define([lt_unquote], $1) ++ ++ ++# lt_append(MACRO-NAME, STRING, [SEPARATOR]) ++# ------------------------------------------ ++# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. ++# Note that neither SEPARATOR nor STRING are expanded; they are appended ++# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). ++# No SEPARATOR is output if MACRO-NAME was previously undefined (different ++# than defined and empty). ++# ++# This macro is needed until we can rely on Autoconf 2.62, since earlier ++# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. ++m4_define([lt_append], ++[m4_define([$1], ++ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) ++ ++ ++ ++# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) ++# ---------------------------------------------------------- ++# Produce a SEP delimited list of all paired combinations of elements of ++# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list ++# has the form PREFIXmINFIXSUFFIXn. ++# Needed until we can rely on m4_combine added in Autoconf 2.62. ++m4_define([lt_combine], ++[m4_if(m4_eval([$# > 3]), [1], ++ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl ++[[m4_foreach([_Lt_prefix], [$2], ++ [m4_foreach([_Lt_suffix], ++ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, ++ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) ++ ++ ++# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) ++# ----------------------------------------------------------------------- ++# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited ++# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. ++m4_define([lt_if_append_uniq], ++[m4_ifdef([$1], ++ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], ++ [lt_append([$1], [$2], [$3])$4], ++ [$5])], ++ [lt_append([$1], [$2], [$3])$4])]) ++ ++ ++# lt_dict_add(DICT, KEY, VALUE) ++# ----------------------------- ++m4_define([lt_dict_add], ++[m4_define([$1($2)], [$3])]) ++ ++ ++# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) ++# -------------------------------------------- ++m4_define([lt_dict_add_subkey], ++[m4_define([$1($2:$3)], [$4])]) ++ ++ ++# lt_dict_fetch(DICT, KEY, [SUBKEY]) ++# ---------------------------------- ++m4_define([lt_dict_fetch], ++[m4_ifval([$3], ++ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), ++ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) ++ ++ ++# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) ++# ----------------------------------------------------------------- ++m4_define([lt_if_dict_fetch], ++[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], ++ [$5], ++ [$6])]) ++ ++ ++# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) ++# -------------------------------------------------------------- ++m4_define([lt_dict_filter], ++[m4_if([$5], [], [], ++ [lt_join(m4_quote(m4_default([$4], [[, ]])), ++ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), ++ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl ++]) ++ ++# ltversion.m4 -- version numbers -*- Autoconf -*- ++# ++# Copyright (C) 2004 Free Software Foundation, Inc. ++# Written by Scott James Remnant, 2004 ++# ++# 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. ++ ++# Generated from ltversion.in. ++ ++# serial 3017 ltversion.m4 ++# This file is part of GNU Libtool ++ ++m4_define([LT_PACKAGE_VERSION], [2.2.6b]) ++m4_define([LT_PACKAGE_REVISION], [1.3017]) ++ ++AC_DEFUN([LTVERSION_VERSION], ++[macro_version='2.2.6b' ++macro_revision='1.3017' ++_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) ++_LT_DECL(, macro_revision, 0) ++]) ++ ++# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- ++# ++# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. ++# Written by Scott James Remnant, 2004. ++# ++# 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. ++ ++# serial 4 lt~obsolete.m4 ++ ++# These exist entirely to fool aclocal when bootstrapping libtool. ++# ++# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) ++# which have later been changed to m4_define as they aren't part of the ++# exported API, or moved to Autoconf or Automake where they belong. ++# ++# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN ++# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us ++# using a macro with the same name in our local m4/libtool.m4 it'll ++# pull the old libtool.m4 in (it doesn't see our shiny new m4_define ++# and doesn't know about Autoconf macros at all.) ++# ++# So we provide this file, which has a silly filename so it's always ++# included after everything else. This provides aclocal with the ++# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything ++# because those macros already exist, or will be overwritten later. ++# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. ++# ++# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. ++# Yes, that means every name once taken will need to remain here until ++# we give up compatibility with versions before 1.7, at which point ++# we need to keep only those names which we still refer to. ++ ++# This is to help aclocal find these macros, as it can't see m4_define. ++AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) ++ ++m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) ++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) ++m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) ++m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) ++m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) ++m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) ++m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) ++m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) ++m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) ++m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) ++m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) ++m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) ++m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) ++m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) ++m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) ++m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) ++m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) ++m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) ++m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) ++m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) ++m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) ++m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) ++m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) ++m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) ++m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) ++m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) ++m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) ++m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) ++m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) ++m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) ++m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) ++m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) ++m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) ++m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) ++m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) ++m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) ++m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) ++m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) ++m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) ++m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) ++m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) ++m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) ++m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) ++m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) ++m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) ++ ++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 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. + + # AM_AUTOMAKE_VERSION(VERSION) + # ---------------------------- + # Automake X.Y traces this macro to ensure aclocal.m4 has been + # generated from the m4 files accompanying Automake X.Y. +-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) ++# (This private macro should not be called outside this file.) ++AC_DEFUN([AM_AUTOMAKE_VERSION], ++[am__api_version='1.11' ++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to ++dnl require some minimum version. Point them to the right macro. ++m4_if([$1], [1.11.1], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ++]) ++ ++# _AM_AUTOCONF_VERSION(VERSION) ++# ----------------------------- ++# aclocal traces this macro to find the Autoconf version. ++# This is a private macro too. Using m4_define simplifies ++# the logic in aclocal, which can simply ignore this definition. ++m4_define([_AM_AUTOCONF_VERSION], []) + + # AM_SET_CURRENT_AUTOMAKE_VERSION + # ------------------------------- +-# Call AM_AUTOMAKE_VERSION so it can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. ++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.8.3])]) +- +-# AM_AUX_DIR_EXPAND +- +-# Copyright (C) 2001, 2003 Free Software Foundation, Inc. +- +-# 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, 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. ++[AM_AUTOMAKE_VERSION([1.11.1])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) ++ ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2003, 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. + + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets + # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +@@ -6014,26 +8074,16 @@ + am_aux_dir=`cd $ac_aux_dir && pwd` + ]) + +-# AM_CONDITIONAL -*- Autoconf -*- +- +-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. +- +-# 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, 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. +- +-# serial 6 ++# AM_CONDITIONAL -*- Autoconf -*- ++ ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 ++# 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. ++ ++# serial 9 + + # AM_CONDITIONAL(NAME, SHELL-CONDITION) + # ------------------------------------- +@@ -6042,8 +8092,11 @@ + [AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE]) +-AC_SUBST([$1_FALSE]) ++AC_SUBST([$1_TRUE])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl ++m4_define([_AM_COND_VALUE_$1], [$2])dnl + if $2; then + $1_TRUE= + $1_FALSE='#' +@@ -6053,30 +8106,18 @@ + fi + AC_CONFIG_COMMANDS_PRE( + [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]) ++ AC_MSG_ERROR([[conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]]) + fi])]) + +-# serial 7 -*- Autoconf -*- +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 + # Free Software Foundation, Inc. +- +-# 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, 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. +- ++# ++# 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. ++ ++# serial 10 + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, +@@ -6085,7 +8126,6 @@ + # CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +- + # _AM_DEPENDENCIES(NAME) + # ---------------------- + # See how the compiler implements dependency checking. +@@ -6105,6 +8145,7 @@ + ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +@@ -6133,6 +8174,16 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi ++ am__universal=false ++ m4_case([$1], [CC], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac], ++ [CXX], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac]) ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -6150,7 +8201,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -6160,23 +8221,33 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings +- # (even with -Werror). So we grep stderr for any message +- # that says an option was ignored. +- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi +@@ -6217,77 +8288,74 @@ + AMDEPBACKSLASH='\' + fi + AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl + ]) + +-# Generate code to set up dependency tracking. -*- Autoconf -*- +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +- +-# 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, 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. +- +-#serial 2 ++# Generate code to set up dependency tracking. -*- Autoconf -*- ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 ++# 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. ++ ++#serial 5 + + # _AM_OUTPUT_DEPENDENCY_COMMANDS + # ------------------------------ + AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue +- # Extract the definition of DEP_FILES from the Makefile without +- # running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" +- # We invoke sed twice because it is the simplest approach to +- # changing $(DEPDIR) to its actual value in the expansion. +- for file in `sed -n ' +- /^DEP_FILES = .*\\\\$/ { +- s/^DEP_FILES = // +- :loop +- s/\\\\$// +- p +- n +- /\\\\$/ b loop +- p +- } +- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" ++[{ ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done + done +-done ++} + ])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +@@ -6304,31 +8372,20 @@ + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) + ]) + +-# Do all the work for Automake. -*- Autoconf -*- +- +-# This macro actually does too much some checks are only needed if ++# Do all the work for Automake. -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2008, 2009 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. ++ ++# serial 16 ++ ++# This macro actually does too much. Some checks are only needed if + # your package does certain things. But this isn't really a big deal. + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. +- +-# 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, 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. +- +-# serial 11 +- + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) + # AM_INIT_AUTOMAKE([OPTIONS]) + # ----------------------------------------------- +@@ -6341,16 +8398,20 @@ + # arguments mandatory, and then we can depend on a new Autoconf + # release and drop the old call support. + AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.58])dnl ++[AC_PREREQ([2.62])dnl + dnl Autoconf wants to disallow AM_ names. We explicitly allow + dnl the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ fi + fi + + # test whether we have cygpath +@@ -6370,6 +8431,9 @@ + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], + [_AM_SET_OPTIONS([$1])dnl ++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +@@ -6385,28 +8449,46 @@ + AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) + AM_MISSING_PROG(AUTOHEADER, autoheader) + AM_MISSING_PROG(MAKEINFO, makeinfo) +-AM_MISSING_PROG(AMTAR, tar) +-AM_PROG_INSTALL_SH +-AM_PROG_INSTALL_STRIP ++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl + AC_REQUIRE([AM_PROG_MKDIR_P])dnl + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. + AC_REQUIRE([AC_PROG_AWK])dnl + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AM_SET_LEADING_DOT])dnl +- ++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) + _AM_IF_OPTION([no-dependencies],, + [AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + ]) ++_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl ++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the ++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro ++dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. ++AC_CONFIG_COMMANDS_PRE(dnl ++[m4_provide_if([_AM_COMPILER_EXEEXT], ++ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + ]) + ++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not ++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further ++dnl mangled by Autoconf and run in a shell conditional statement. ++m4_define([_AC_COMPILER_EXEEXT], ++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) ++ + + # When config.status generates a header, we must update the stamp-h file. + # This file resides in the same directory as the config header +@@ -6417,62 +8499,46 @@ + # our stamp files there. + AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], + [# Compute $1's index in $config_headers. ++_am_arg=$1 + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $1 | $1:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) ++ ++# Copyright (C) 2001, 2003, 2005, 2008 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. + + # AM_PROG_INSTALL_SH + # ------------------ + # Define $install_sh. +- +-# Copyright (C) 2001, 2003 Free Software Foundation, Inc. +- +-# 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, 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. +- + AC_DEFUN([AM_PROG_INSTALL_SH], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"$am_aux_dir/install-sh"} ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi + AC_SUBST(install_sh)]) + +-# -*- Autoconf -*- +-# Copyright (C) 2003 Free Software Foundation, Inc. +- +-# 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, 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. +- +-# serial 1 ++# Copyright (C) 2003, 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. ++ ++# serial 2 + + # Check whether the underlying file-system supports filenames + # with a leading dot. For instance MS-DOS doesn't. +@@ -6487,26 +8553,55 @@ + rmdir .tst 2>/dev/null + AC_SUBST([am__leading_dot])]) + +-# Check to see how 'make' treats includes. -*- Autoconf -*- +- +-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +- +-# 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, 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. +- +-# serial 2 ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering ++ ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 ++# 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. ++ ++# serial 5 ++ ++# AM_MAINTAINER_MODE([DEFAULT-MODE]) ++# ---------------------------------- ++# Control maintainer-specific portions of Makefiles. ++# Default is to disable them, unless `enable' is passed literally. ++# For symmetry, `disable' may be passed as well. Anyway, the user ++# can override the default with the --enable/--disable switch. ++AC_DEFUN([AM_MAINTAINER_MODE], ++[m4_case(m4_default([$1], [disable]), ++ [enable], [m4_define([am_maintainer_other], [disable])], ++ [disable], [m4_define([am_maintainer_other], [enable])], ++ [m4_define([am_maintainer_other], [enable]) ++ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) ++AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode's default is 'disable' unless 'enable' is passed ++ AC_ARG_ENABLE([maintainer-mode], ++[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ [USE_MAINTAINER_MODE=$enableval], ++ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST([MAINT])dnl ++] ++) ++ ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++ ++# Check to see how 'make' treats includes. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005, 2009 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. ++ ++# serial 4 + + # AM_MAKE_INCLUDE() + # ----------------- +@@ -6515,7 +8610,7 @@ + [am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: +- @echo done ++ @echo this is the am__doit target + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +@@ -6525,24 +8620,24 @@ + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- fi ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac + fi + AC_SUBST([am__include]) + AC_SUBST([am__quote]) +@@ -6550,27 +8645,16 @@ + rm -f confinc confmf + ]) + +-# -*- Autoconf -*- +- +- +-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +- +-# 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, 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. +- +-# serial 3 ++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++ ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 ++# 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. ++ ++# serial 6 + + # AM_MISSING_PROG(NAME, PROGRAM) + # ------------------------------ +@@ -6586,7 +8670,15 @@ + # If it does, set am_missing_run to use it, otherwise, to nothing. + AC_DEFUN([AM_MISSING_HAS_RUN], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++AC_REQUIRE_AUX_FILE([missing])dnl ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +@@ -6596,92 +8688,41 @@ + fi + ]) + ++# Copyright (C) 2003, 2004, 2005, 2006 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. ++ + # AM_PROG_MKDIR_P + # --------------- +-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +- +-# Copyright (C) 2003, 2004 Free Software Foundation, Inc. +- +-# 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, 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. +- +-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +-# created by `make install' are always world readable, even if the +-# installer happens to have an overly restrictive umask (e.g. 077). +-# This was a mistake. There are at least two reasons why we must not +-# use `-m 0755': +-# - it causes special bits like SGID to be ignored, +-# - it may be too restrictive (some setups expect 775 directories). ++# Check for `mkdir -p'. ++AC_DEFUN([AM_PROG_MKDIR_P], ++[AC_PREREQ([2.60])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, ++dnl while keeping a definition of mkdir_p for backward compatibility. ++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. ++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of ++dnl Makefile.ins that do not define MKDIR_P, so we do our own ++dnl adjustment using top_builddir (which is defined more often than ++dnl MKDIR_P). ++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl ++case $mkdir_p in ++ [[\\/$]]* | ?:[[\\/]]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++]) ++ ++# Helper functions for option handling. -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. + # +-# Do not use -m 0755 and let people choose whatever they expect by +-# setting umask. +-# +-# We cannot accept any implementation of `mkdir' that recognizes `-p'. +-# Some implementations (such as Solaris 8's) are not thread-safe: if a +-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +-# concurrently, both version can detect that a/ is missing, but only +-# one can create it and the other will error out. Consequently we +-# restrict ourselves to GNU make (using the --version option ensures +-# this.) +-AC_DEFUN([AM_PROG_MKDIR_P], +-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # Keeping the `.' argument allows $(mkdir_p) to be used without +- # argument. Indeed, we sometimes output rules like +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. +- # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more +- # expensive solution, as it forces Make to start a sub-shell.) +- mkdir_p='mkdir -p -- .' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' +- else +- mkdir_p='$(install_sh) -d' +- fi +-fi +-AC_SUBST([mkdir_p])]) +- +-# Helper functions for option handling. -*- Autoconf -*- +- +-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +- +-# 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, 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. +- +-# serial 2 ++# 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. ++ ++# serial 4 + + # _AM_MANGLE_OPTION(NAME) + # ----------------------- +@@ -6698,7 +8739,7 @@ + # ---------------------------------- + # OPTIONS is a space-separated list of Automake options. + AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + + # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) + # ------------------------------------------- +@@ -6706,28 +8747,16 @@ + AC_DEFUN([_AM_IF_OPTION], + [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + ++# Check to make sure that the build environment is sane. -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 ++# Free Software Foundation, Inc. + # +-# Check to make sure that the build environment is sane. +-# +- +-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. +- +-# 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, 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. +- +-# serial 3 ++# 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. ++ ++# serial 5 + + # AM_SANITY_CHECK + # --------------- +@@ -6736,16 +8765,29 @@ + # Just in case + sleep 1 + echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[[\\\"\#\$\&\'\`$am_lf]]*) ++ AC_MSG_ERROR([unsafe absolute working directory name]);; ++esac ++case $srcdir in ++ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) ++ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; ++esac ++ + # Do `set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). + if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` ++ set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ +@@ -6770,25 +8812,14 @@ + fi + AC_MSG_RESULT(yes)]) + ++# Copyright (C) 2001, 2003, 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. ++ + # AM_PROG_INSTALL_STRIP +- +-# Copyright (C) 2001, 2003 Free Software Foundation, Inc. +- +-# 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, 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. +- ++# --------------------- + # One issue with vendor `install' (even GNU) is that you can't + # specify the program used to strip binaries. This is especially + # annoying in cross-compiling environments, where the build's strip +@@ -6806,7 +8837,122 @@ + if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) + fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + ++# Copyright (C) 2006, 2008 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. ++ ++# serial 2 ++ ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) ++ ++# AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Public sister of _AM_SUBST_NOTMAKE. ++AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) ++ ++# Check how to create a tarball. -*- Autoconf -*- ++ ++# Copyright (C) 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. ++ ++# serial 2 ++ ++# _AM_PROG_TAR(FORMAT) ++# -------------------- ++# Check how to create a tarball in format FORMAT. ++# FORMAT should be one of `v7', `ustar', or `pax'. ++# ++# Substitute a variable $(am__tar) that is a command ++# writing to stdout a FORMAT-tarball containing the directory ++# $tardir. ++# tardir=directory && $(am__tar) > result.tar ++# ++# Substitute a variable $(am__untar) that extract such ++# a tarball read from stdin. ++# $(am__untar) < result.tar ++AC_DEFUN([_AM_PROG_TAR], ++[# Always define AMTAR for backward compatibility. ++AM_MISSING_PROG([AMTAR], [tar]) ++m4_if([$1], [v7], ++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [m4_case([$1], [ustar],, [pax],, ++ [m4_fatal([Unknown tar format])]) ++AC_MSG_CHECKING([how to create a $1 tar archive]) ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools=${am_cv_prog_tar_$1-$_am_tools} ++# Do not fold the above two line into one, because Tru64 sh and ++# Solaris sh will not grok spaces in the rhs of `-'. ++for _am_tool in $_am_tools ++do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; ++ do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac ++ ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break ++ ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++ fi ++done ++rm -rf conftest.dir ++ ++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++AC_SUBST([am__tar]) ++AC_SUBST([am__untar]) ++]) # _AM_PROG_TAR ++ + m4_include([acinclude.m4]) +diff -r 3c8a74e0c599 blcr_config.h.in +--- a/blcr_config.h.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/blcr_config.h.in Sun Apr 11 16:31:36 2010 +0200 +@@ -51,6 +51,9 @@ + /* Computed value of 'offsetof(struct siginfo, si_pid)' */ + #undef CR_ASM_SI_PID_OFFSET + ++/* Define to address of exported kernel symbol __register_chrdev */ ++#undef CR_EXPORTED_KCODE___register_chrdev ++ + /* Define to address of exported kernel symbol register_blkdev */ + #undef CR_EXPORTED_KCODE_register_blkdev + +@@ -143,6 +146,10 @@ + */ + #undef CR_KCODE_find_pid + ++/* Define to address of non-exported kernel symbol find_task_by_pid_ns, or 0 ++ if exported */ ++#undef CR_KCODE_find_task_by_pid_ns ++ + /* Define to address of non-exported kernel symbol follow_huge_addr, or 0 if + exported */ + #undef CR_KCODE_follow_huge_addr +@@ -910,6 +917,10 @@ + the 'LIBCR_TRACE_MASK' environment variable */ + #undef LIBCR_TRACING + ++/* Define to the sub-directory in which libtool stores uninstalled libraries. ++ */ ++#undef LT_OBJDIR ++ + /* Name of package */ + #undef PACKAGE + +@@ -925,10 +936,13 @@ + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + ++/* Define to the home page for this package. */ ++#undef PACKAGE_URL ++ + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + +-/* The size of a `void *', as computed by sizeof. */ ++/* The size of `void *', as computed by sizeof. */ + #undef SIZEOF_VOID_P + + /* Define to 1 if you have the ANSI C header files. */ +diff -r 3c8a74e0c599 blcr_imports/Makefile.in +--- a/blcr_imports/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/blcr_imports/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -13,17 +14,12 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-SOURCES = imports.c module.c +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -35,6 +31,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + subdir = blcr_imports + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +@@ -44,87 +41,74 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = imports.c ++CONFIG_CLEAN_VPATH_FILES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -145,20 +129,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -166,12 +150,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -185,70 +168,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + + # Vars needed by kbuild + SOURCES = imports.c module.c +@@ -262,18 +266,18 @@ + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign blcr_imports/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign blcr_imports/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign blcr_imports/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign blcr_imports/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -287,10 +291,11 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + imports.c: $(top_builddir)/config.status $(srcdir)/imports.c.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +@@ -300,10 +305,6 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -311,7 +312,13 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @fail= failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -322,16 +329,21 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @fail= failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -351,16 +363,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -368,94 +380,120 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ test ! -f $$subdir/TAGS || \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || mkdir "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- (cd $$subdir && \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="../$(top_distdir)" \ +- distdir="../$(distdir)/$$subdir" \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -487,7 +525,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -498,8 +537,7 @@ + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -507,18 +545,38 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-recursive ++ ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-pdf-am: ++ ++install-ps: install-ps-recursive ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -537,22 +595,24 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ ++ install-am install-strip tags-recursive + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ +- check-am clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am all-local check check-am clean clean-generic \ ++ clean-libtool ctags ctags-recursive dist-hook distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am uninstall-info-am ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + + + # Additional dependence for file generated via AC_SUBST_FILE() +@@ -566,6 +626,7 @@ + + dist-hook: + rm -f $(distdir)/imports.c ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 blcr_imports/module.c +--- a/blcr_imports/module.c Sun Apr 11 12:41:30 2010 +0200 ++++ b/blcr_imports/module.c Sun Apr 11 16:31:36 2010 +0200 +@@ -81,7 +81,13 @@ + + /* Check current kernel against System.map used at configure time */ + { ++#if defined(CR_EXPORTED_KCODE_register_chrdev) + unsigned long offset1 = CR_EXPORTED_KCODE_register_chrdev - (unsigned long)®ister_chrdev; ++#elif defined(CR_EXPORTED_KCODE___register_chrdev) ++ unsigned long offset1 = CR_EXPORTED_KCODE___register_chrdev - (unsigned long)&__register_chrdev; ++#else ++ #error "No register_chrdev symbol for validation of System.map" ++#endif + unsigned long offset2 = CR_EXPORTED_KCODE_register_blkdev - (unsigned long)®ister_blkdev; + if ( + #if defined(CONFIG_RELOCATABLE) && defined(CONFIG_PHYSICAL_ALIGN) +diff -r 3c8a74e0c599 config/config.guess +--- a/config/config.guess Sun Apr 11 12:41:30 2010 +0200 ++++ b/config/config.guess Sun Apr 11 16:31:36 2010 +0200 +@@ -1,9 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ++# Free Software Foundation, Inc. + +-timestamp='2004-03-03' ++timestamp='2009-06-10' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,13 +18,15 @@ + # + # 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. ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, 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. + ++ + # Originally written by Per Bothner . + # Please send patches to . Submit a context + # diff and a properly formatted ChangeLog entry. +@@ -53,8 +56,8 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -66,11 +69,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -104,7 +107,7 @@ + trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; + trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; + : ${TMPDIR=/tmp} ; +- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +@@ -123,7 +126,7 @@ + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +-esac ;' ++esac ; set_cc_for_build= ;' + + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. + # (ghazi@noc.rutgers.edu 1994-08-24) +@@ -136,16 +139,6 @@ + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +-case "${UNAME_MACHINE}" in +- i?86) +- test -z "$VENDOR" && VENDOR=pc +- ;; +- *) +- test -z "$VENDOR" && VENDOR=unknown +- ;; +-esac +-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse +- + # Note: order is significant - the case branches are not exclusive. + + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +@@ -168,6 +161,7 @@ + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched +@@ -176,7 +170,7 @@ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -206,64 +200,23 @@ + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" +- exit 0 ;; +- amd64:OpenBSD:*:*) +- echo x86_64-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- amiga:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- cats:OpenBSD:*:*) +- echo arm-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- hp300:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- macppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvmeppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pegasos:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pmax:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sgi:OpenBSD:*:*) +- echo mipseb-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sun3:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- wgrisc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; + macppc:MirBSD:*:*) +- echo powerppc-unknown-mirbsd${UNAME_RELEASE} +- exit 0 ;; ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) +@@ -316,40 +269,43 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit 0 ;; +- Alpha*:OpenVMS:*:*) +- echo alpha-hp-vms +- exit 0 ;; ++ exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix +- exit 0 ;; ++ exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 +- exit 0 ;; ++ exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 +- exit 0;; ++ exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos +- exit 0 ;; ++ exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos +- exit 0 ;; ++ exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition +- exit 0 ;; ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 +- exit 0 ;; ++ exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} +- exit 0;; ++ exit ;; ++ arm:riscos:*:*|arm:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp +- exit 0;; ++ exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then +@@ -357,32 +313,48 @@ + else + echo pyramid-pyramid-bsd + fi +- exit 0 ;; ++ exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 +- exit 0 ;; ++ exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 +- exit 0 ;; +- DRS?6000:UNIX_SV:4.2*:7*) ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in +- sparc) echo sparc-icl-nx7 && exit 0 ;; ++ sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- i86pc:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) +@@ -391,10 +363,10 @@ + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit 0 ;; ++ exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 +@@ -406,10 +378,10 @@ + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac +- exit 0 ;; ++ exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor +@@ -420,40 +392,40 @@ + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 +- exit 0 ;; ++ exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -477,32 +449,33 @@ + exit (-1); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c \ +- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ +- && exit 0 ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax +- exit 0 ;; ++ exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix +- exit 0 ;; ++ exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 +- exit 0 ;; ++ exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 +- exit 0 ;; ++ exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` +@@ -518,29 +491,29 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 +- exit 0 ;; ++ exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 +- exit 0 ;; ++ exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd +- exit 0 ;; ++ exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit 0 ;; ++ exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix +- exit 0 ;; ++ exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` +@@ -548,7 +521,7 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build +@@ -563,15 +536,19 @@ + exit(0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 +- echo rs6000-ibm-aix3.2.5 ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi +- exit 0 ;; +- *:AIX:*:[45]) ++ exit ;; ++ *:AIX:*:[456]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -584,28 +561,28 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix +- exit 0 ;; ++ exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 +- exit 0 ;; ++ exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit 0 ;; # report: romp-ibm BSD 4.3 ++ exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx +- exit 0 ;; ++ exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 +- exit 0 ;; ++ exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd +- exit 0 ;; ++ exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 +- exit 0 ;; ++ exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in +@@ -667,9 +644,19 @@ + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then +- # avoid double evaluation of $set_cc_for_build +- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build +- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null ++ eval $set_cc_for_build ++ ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 ++ ++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else +@@ -677,11 +664,11 @@ + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -709,207 +696,227 @@ + exit (0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 ++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 +- exit 0 ;; ++ exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd +- exit 0 ;; ++ exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd +- exit 0 ;; ++ exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix +- exit 0 ;; ++ exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf +- exit 0 ;; ++ exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf +- exit 0 ;; ++ exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi +- exit 0 ;; ++ exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites +- exit 0 ;; ++ exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + *:UNICOS/mp:*:*) +- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:FreeBSD:*:*) +- # Determine whether the default compiler uses glibc. +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #if __GLIBC__ >= 2 +- LIBC=gnu +- #else +- LIBC= +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using +- # FreeBSD's kernel, but not the complete OS. +- case ${LIBC} in gnu) kernel_only='k' ;; esac +- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} +- exit 0 ;; ++ case ${UNAME_MACHINE} in ++ pc98) ++ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ amd64) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac ++ exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin +- exit 0 ;; +- i*:MINGW*:*) ++ exit ;; ++ *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 +- exit 0 ;; ++ exit ;; ++ i*:windows32*:*) ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 ++ exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 +- exit 0 ;; +- x86:Interix*:[34]*) +- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' +- exit 0 ;; ++ exit ;; ++ *:Interix*:[3456]*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ EM64T | authenticamd | genuineintel) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks +- exit 0 ;; ++ exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix +- exit 0 ;; ++ exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin +- exit 0 ;; ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-unknown-cygwin ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin +- exit 0 ;; ++ exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- exit 0 ;; ++ exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu +- exit 0 ;; ++ exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix +- exit 0 ;; ++ exit ;; + arm*:Linux:*:*) +- echo ${UNAME_MACHINE}-${VENDOR}-linux +- exit 0 ;; ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + cris:Linux:*:*) +- echo cris-axis-linux +- exit 0 ;; ++ echo cris-axis-linux-gnu ++ exit ;; ++ crisv32:Linux:*:*) ++ echo crisv32-axis-linux-gnu ++ exit ;; ++ frv:Linux:*:*) ++ echo frv-unknown-linux-gnu ++ exit ;; + ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-${VENDOR}-linux +- exit 0 ;; ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + m68*:Linux:*:*) +- echo ${UNAME_MACHINE}-${VENDOR}-linux +- exit 0 ;; +- mips:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips +- #undef mipsel ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0 ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^CPU/{ ++ s: ::g ++ p ++ }'`" ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; +- mips64:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips64 +- #undef mips64el +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 +- #else +- CPU= +- #endif +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0 +- ;; ++ or32:Linux:*:*) ++ echo or32-unknown-linux-gnu ++ exit ;; + ppc:Linux:*:*) +- echo powerpc-${VENDOR}-linux +- exit 0 ;; ++ echo powerpc-unknown-linux-gnu ++ exit ;; + ppc64:Linux:*:*) +- echo powerpc64-${VENDOR}-linux +- exit 0 ;; ++ echo powerpc64-unknown-linux-gnu ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +@@ -920,36 +927,45 @@ + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC} +- exit 0 ;; ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +- PA7*) echo hppa1.1-${VENDOR}-linux ;; +- PA8*) echo hppa2.0-${VENDOR}-linux ;; +- *) echo hppa-${VENDOR}-linux ;; ++ PA7*) echo hppa1.1-unknown-linux-gnu ;; ++ PA8*) echo hppa2.0-unknown-linux-gnu ;; ++ *) echo hppa-unknown-linux-gnu ;; + esac +- exit 0 ;; ++ exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-${VENDOR}-linux +- exit 0 ;; ++ echo hppa64-unknown-linux-gnu ++ exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux +- exit 0 ;; ++ exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-${VENDOR}-linux +- exit 0 ;; ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + sh*:Linux:*:*) +- echo ${UNAME_MACHINE}-${VENDOR}-linux +- exit 0 ;; ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) +- echo ${UNAME_MACHINE}-${VENDOR}-linux +- exit 0 ;; ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-gnu ++ exit ;; + x86_64:Linux:*:*) +- echo x86_64-${VENDOR}-linux +- exit 0 ;; ++ echo x86_64-unknown-linux-gnu ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent +@@ -963,19 +979,8 @@ + p'` + case "$ld_supported_targets" in + elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux" ++ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-${VENDOR}-linuxaout" +- exit 0 ;; +- coff-i386) +- echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff" +- exit 0 ;; +- "") +- # Either a pre-BFD a.out linker (linuxoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld" +- exit 0 ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build +@@ -992,7 +997,7 @@ + LIBC=gnulibc1 + # endif + #else +- #ifdef __INTEL_COMPILER ++ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout +@@ -1002,16 +1007,23 @@ + LIBC=dietlibc + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0 +- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^LIBC/{ ++ s: ::g ++ p ++ }'`" ++ test x"${LIBC}" != x && { ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ++ } ++ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 +- exit 0 ;; ++ exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... +@@ -1019,27 +1031,27 @@ + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} +- exit 0 ;; ++ exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx +- exit 0 ;; ++ exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop +- exit 0 ;; ++ exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos +- exit 0 ;; +- i*86:syllable:*:*) ++ exit ;; ++ i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable +- exit 0 ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp +- exit 0 ;; ++ exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +@@ -1047,15 +1059,16 @@ + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi +- exit 0 ;; +- i*86:*:5:[78]*) ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} +- exit 0 ;; ++ exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi +- exit 0 ;; ++ exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv +- exit 0 ;; ++ exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv +- exit 0 ;; ++ exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix +- exit 0 ;; +- M68*:*:R3V[567]*:*) +- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4 && exit 0 ;; ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 +- exit 0 ;; ++ exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` +@@ -1147,68 +1173,84 @@ + else + echo ns32k-sni-sysv + fi +- exit 0 ;; ++ exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 +- exit 0 ;; ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 +- exit 0 ;; ++ exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 +- exit 0 ;; ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo ${UNAME_MACHINE}-stratus-vos ++ exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos +- exit 0 ;; ++ exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 +- exit 0 ;; ++ exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos +- exit 0 ;; ++ exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos +- exit 0 ;; ++ exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos +- exit 0 ;; ++ exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Darwin:*:*) +- case `uname -p` in +- *86) UNAME_PROCESSOR=i686 ;; +- powerpc) UNAME_PROCESSOR=powerpc ;; ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ case $UNAME_PROCESSOR in ++ unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then +@@ -1216,22 +1258,25 @@ + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:QNX:*:4*) + echo i386-pc-qnx +- exit 0 ;; ++ exit ;; ++ NSE-?:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk${UNAME_RELEASE} ++ exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux +- exit 0 ;; ++ exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv +- exit 0 ;; ++ exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 +@@ -1242,31 +1287,50 @@ + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 +- exit 0 ;; ++ exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 +- exit 0 ;; ++ exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex +- exit 0 ;; ++ exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 +- exit 0 ;; ++ exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 +- exit 0 ;; ++ exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 +- exit 0 ;; ++ exit ;; + *:ITS:*:*) + echo pdp10-unknown-its +- exit 0 ;; ++ exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` +- exit 0 ;; ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "${UNAME_MACHINE}" in ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; ++ esac ;; ++ *:XENIX:*:SysV) ++ echo i386-pc-xenix ++ exit ;; ++ i*86:skyos:*:*) ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ exit ;; ++ i*86:rdos:*:*) ++ echo ${UNAME_MACHINE}-pc-rdos ++ exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; + esac + + #echo '(No uname command or uname output not recognized.)' 1>&2 +@@ -1298,7 +1362,7 @@ + #endif + + #if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix"); exit (0); ++ printf ("arm-acorn-riscix\n"); exit (0); + #endif + + #if defined (hp300) && !defined (hpux) +@@ -1387,11 +1451,12 @@ + } + EOF + +-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 ++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + + # Apollos put the system type in the environment. + +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } ++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + + # Convex versions that predate uname can use getsysinfo(1) + +@@ -1400,22 +1465,22 @@ + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + c34*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + c38*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + c4*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + esac + fi + +@@ -1426,7 +1491,9 @@ + the operating system you are using. It is advised that you + download the most up to date version of the config scripts from + +- ftp://ftp.gnu.org/pub/gnu/config/ ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++and ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + + If the version you run ($0) is already up to date, please + send the following data and any information you think might be +diff -r 3c8a74e0c599 config/config.sub +--- a/config/config.sub Sun Apr 11 12:41:30 2010 +0200 ++++ b/config/config.sub Sun Apr 11 16:31:36 2010 +0200 +@@ -1,9 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ++# Free Software Foundation, Inc. + +-timestamp='2004-02-23' ++timestamp='2009-06-11' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,14 +22,15 @@ + # + # 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. +- ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, 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. + ++ + # Please send patches to . Submit a context + # diff and a properly formatted ChangeLog entry. + # +@@ -70,8 +72,8 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -83,11 +85,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -99,7 +101,7 @@ + *local*) + # First pass through any local machine types. + echo $1 +- exit 0;; ++ exit ;; + + * ) + break ;; +@@ -118,8 +120,10 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ +- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; +@@ -145,10 +149,13 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis) ++ -apple | -axis | -knuth | -cray) + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 +@@ -170,6 +177,10 @@ + -hiux*) + os=-hiuxwe2 + ;; ++ -sco6) ++ os=-sco5v6 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -186,6 +197,10 @@ + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -sco5v6*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -230,22 +245,28 @@ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ +- | fr30 | frv \ ++ | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ +- | m32r | m68000 | m68k | m88k | mcore \ ++ | lm32 \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ ++ | mips64octeon | mips64octeonel \ ++ | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ +- | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ ++ | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ +@@ -254,21 +275,26 @@ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ ++ | mt \ + | msp430 \ ++ | nios | nios2 \ + | ns16k | ns32k \ +- | openrisc | or32 \ ++ | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ +- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ +- | strongarm \ ++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ +- | x86 | xscale | xstormy16 | xtensa \ +- | z8k) ++ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) +@@ -278,6 +304,9 @@ + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; ++ ms1) ++ basic_machine=mt-unknown ++ ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and +@@ -297,28 +326,32 @@ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ +- | avr-* \ +- | bs2000-* \ ++ | avr-* | avr32-* \ ++ | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ +- | clipper-* | cydra-* \ ++ | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ +- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ +- | m32r-* \ ++ | lm32-* \ ++ | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | mcore-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ ++ | mips64octeon-* | mips64octeonel-* \ ++ | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ +- | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ ++ | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ +@@ -326,26 +359,34 @@ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ ++ | mmix-* \ ++ | mt-* \ + | msp430-* \ +- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ ++ | nios-* | nios2-* \ ++ | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ +- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ +- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ +- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ ++ | sparclite-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ +- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ +- | xtensa-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | xstormy16-* | xtensa*-* \ + | ymp-* \ +- | z8k-*) ++ | z8k-* | z80-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. +@@ -409,6 +450,10 @@ + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -417,10 +462,26 @@ + basic_machine=ns32k-sequent + os=-dynix + ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd +@@ -445,13 +506,20 @@ + basic_machine=j90-cray + os=-unicos + ;; +- cr16c) +- basic_machine=cr16c-unknown ++ craynv) ++ basic_machine=craynv-cray ++ os=-unicosmp ++ ;; ++ cr16) ++ basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; ++ crisv32 | crisv32-* | etraxfs*) ++ basic_machine=crisv32-axis ++ ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; +@@ -481,6 +549,14 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; ++ djgpp) ++ basic_machine=i586-pc ++ os=-msdosdjgpp ++ ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx +@@ -631,6 +707,14 @@ + basic_machine=m68k-isi + os=-sysv + ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + m88k-omron*) + basic_machine=m88k-omron + ;; +@@ -646,6 +730,10 @@ + basic_machine=i386-pc + os=-mingw32 + ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; + miniframe) + basic_machine=m68000-convergent + ;; +@@ -659,10 +747,6 @@ + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; +- mmix*) +- basic_machine=mmix-knuth +- os=-mmixware +- ;; + monitor) + basic_machine=m68k-rom68k + os=-coff +@@ -675,6 +759,9 @@ + basic_machine=i386-pc + os=-msdos + ;; ++ ms1-*) ++ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs +@@ -743,10 +830,6 @@ + np1) + basic_machine=np1-gould + ;; +- nv1) +- basic_machine=nv1-cray +- os=-unicosmp +- ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -754,9 +837,8 @@ + basic_machine=hppa1.1-oki + os=-proelf + ;; +- or32 | or32-*) ++ openrisc | openrisc-*) + basic_machine=or32-unknown +- os=-coff + ;; + os400) + basic_machine=powerpc-ibm +@@ -778,6 +860,14 @@ + basic_machine=i860-intel + os=-osf + ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + pbd) + basic_machine=sparc-tti + ;; +@@ -787,6 +877,12 @@ + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; ++ pc98) ++ basic_machine=i386-pc ++ ;; ++ pc98-*) ++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; +@@ -843,6 +939,10 @@ + basic_machine=i586-unknown + os=-pw32 + ;; ++ rdos) ++ basic_machine=i386-pc ++ os=-rdos ++ ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff +@@ -869,6 +969,10 @@ + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; + sei) + basic_machine=mips-sei + os=-seiux +@@ -880,6 +984,9 @@ + basic_machine=sh-hitachi + os=-hms + ;; ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; + sh64) + basic_machine=sh64-unknown + ;; +@@ -969,6 +1076,10 @@ + basic_machine=tic6x-unknown + os=-coff + ;; ++ tile*) ++ basic_machine=tile-unknown ++ os=-linux-gnu ++ ;; + tx39) + basic_machine=mipstx39-unknown + ;; +@@ -1029,6 +1140,10 @@ + basic_machine=hppa1.1-winbond + os=-proelf + ;; ++ xbox) ++ basic_machine=i686-pc ++ os=-mingw32 ++ ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; +@@ -1040,6 +1155,10 @@ + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -1059,6 +1178,9 @@ + romp) + basic_machine=romp-ibm + ;; ++ mmix) ++ basic_machine=mmix-knuth ++ ;; + rs6000) + basic_machine=rs6000-ibm + ;; +@@ -1075,13 +1197,10 @@ + we32k) + basic_machine=we32k-att + ;; +- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; +- sh64) +- basic_machine=sh64-unknown +- ;; +- sparc | sparcv9 | sparcv9b) ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) +@@ -1148,26 +1267,30 @@ + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ++ | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ +- | -chorusos* | -chorusrdb* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ +- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1185,7 +1308,7 @@ + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ +- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ ++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) +@@ -1194,6 +1317,9 @@ + -linux-dietlibc) + os=-linux-dietlibc + ;; ++ -linux*) ++ os=`echo $os | sed -e 's|linux|linux-gnu|'` ++ ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; +@@ -1291,6 +1417,12 @@ + -kaos*) + os=-kaos + ;; ++ -zvmoe) ++ os=-zvmoe ++ ;; ++ -dicos*) ++ os=-dicos ++ ;; + -none) + ;; + *) +@@ -1313,6 +1445,12 @@ + # system, and we'll never get to this point. + + case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; + *-acorn) + os=-riscix1.2 + ;; +@@ -1322,9 +1460,9 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff +- ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 +@@ -1350,6 +1488,9 @@ + m68*-cisco) + os=-aout + ;; ++ mep-*) ++ os=-elf ++ ;; + mips*-cisco) + os=-elf + ;; +@@ -1368,9 +1509,15 @@ + *-be) + os=-beos + ;; ++ *-haiku) ++ os=-haiku ++ ;; + *-ibm) + os=-aix + ;; ++ *-knuth) ++ os=-mmixware ++ ;; + *-wec) + os=-proelf + ;; +@@ -1473,7 +1620,7 @@ + -sunos*) + vendor=sun + ;; +- -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) +@@ -1536,7 +1683,7 @@ + esac + + echo $basic_machine$os +-exit 0 ++exit + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) +diff -r 3c8a74e0c599 config/depcomp +--- a/config/depcomp Sun Apr 11 12:41:30 2010 +0200 ++++ b/config/depcomp Sun Apr 11 16:31:36 2010 +0200 +@@ -1,9 +1,10 @@ + #! /bin/sh + # depcomp - compile a program generating dependencies as side-effects + +-scriptversion=2003-11-08.23 ++scriptversion=2009-04-28.21; # UTC + +-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc. ++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free ++# Software Foundation, Inc. + + # 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 +@@ -16,9 +17,7 @@ + # 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. ++# along with this program. If not, see . + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -43,17 +42,18 @@ + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. ++ DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + + Report bugs to . + EOF +- exit 0 ++ exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" +- exit 0 ++ exit $? + ;; + esac + +@@ -61,18 +61,10 @@ + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 + fi +-# `libtool' can also be set to `yes' or `no'. + +-if test -z "$depfile"; then +- base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` +- dir=`echo "$object" | sed 's,/.*$,/,'` +- if test "$dir" = "$object"; then +- dir= +- fi +- # FIXME: should be _deps on DOS. +- depfile="$dir.deps/$base" +-fi +- ++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. ++depfile=${depfile-`echo "$object" | ++ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} + tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + + rm -f "$tmpdepfile" +@@ -93,12 +85,34 @@ + depmode=dashmstdout + fi + ++cygpath_u="cygpath -u -f -" ++if test "$depmode" = msvcmsys; then ++ # This is just like msvisualcpp but w/o cygpath translation. ++ # Just convert the backslash-escaped backslashes to single forward ++ # slashes to satisfy depend.m4 ++ cygpath_u="sed s,\\\\\\\\,/,g" ++ depmode=msvisualcpp ++fi ++ + case "$depmode" in + gcc3) + ## gcc 3 implements dependency tracking that does exactly what + ## we want. Yay! Note: for some reason libtool 1.4 doesn't like + ## it if -MD -MP comes after the -MF stuff. Hmm. +- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" ++## Unfortunately, FreeBSD c89 acceptance of flags depends upon ++## the command line argument order; so add the flags where they ++## appear in depend2.am. Note that the slowdown incurred here ++## affects only configure: in makefiles, %FASTDEP% shortcuts this. ++ for arg ++ do ++ case $arg in ++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; ++ *) set fnord "$@" "$arg" ;; ++ esac ++ shift # fnord ++ shift # $arg ++ done ++ "$@" + stat=$? + if test $stat -eq 0; then : + else +@@ -185,14 +199,14 @@ + ' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +-' ' ' >> $depfile +- echo >> $depfile ++' ' ' >> "$depfile" ++ echo >> "$depfile" + + # The second pass generates a dummy entry for each header file. + tr ' ' ' + ' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ +- >> $depfile ++ >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile +@@ -208,34 +222,39 @@ + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. +- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` +- tmpdepfile="$stripped.u" ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$base.u ++ tmpdepfile3=$dir.libs/$base.u + "$@" -Wc,-M + else ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$dir$base.u ++ tmpdepfile3=$dir$base.u + "$@" -M + fi + stat=$? + +- if test -f "$tmpdepfile"; then : +- else +- stripped=`echo "$stripped" | sed 's,^.*/,,'` +- tmpdepfile="$stripped.u" +- fi +- + if test $stat -eq 0; then : + else +- rm -f "$tmpdepfile" ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" ++ do ++ test -f "$tmpdepfile" && break ++ done + if test -f "$tmpdepfile"; then +- outname="$stripped.o" + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. +- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" +- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" ++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" ++ # That's a tab and a space in the []. ++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile +@@ -283,6 +302,51 @@ + rm -f "$tmpdepfile" + ;; + ++hp2) ++ # The "hp" stanza above does not work with aCC (C++) and HP's ia64 ++ # compilers, which have integrated preprocessors. The correct option ++ # to use with these is +Maked; it writes dependencies to a file named ++ # 'foo.d', which lands next to the object file, wherever that ++ # happens to be. ++ # Much of this is similar to the tru64 case; see comments there. ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` ++ if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.d ++ tmpdepfile2=$dir.libs/$base.d ++ "$@" -Wc,+Maked ++ else ++ tmpdepfile1=$dir$base.d ++ tmpdepfile2=$dir$base.d ++ "$@" +Maked ++ fi ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile1" "$tmpdepfile2" ++ exit $stat ++ fi ++ ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" ++ do ++ test -f "$tmpdepfile" && break ++ done ++ if test -f "$tmpdepfile"; then ++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" ++ # Add `dependent.h:' lines. ++ sed -ne '2,${ ++ s/^ *// ++ s/ \\*$// ++ s/$/:/ ++ p ++ }' "$tmpdepfile" >> "$depfile" ++ else ++ echo "#dummy" > "$depfile" ++ fi ++ rm -f "$tmpdepfile" "$tmpdepfile2" ++ ;; ++ + tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. +@@ -294,27 +358,43 @@ + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + + if test "$libtool" = yes; then +- tmpdepfile1="$dir.libs/$base.lo.d" +- tmpdepfile2="$dir.libs/$base.d" ++ # With Tru64 cc, shared objects can also be used to make a ++ # static library. This mechanism is used in libtool 1.4 series to ++ # handle both shared and static libraries in a single compilation. ++ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. ++ # ++ # With libtool 1.5 this exception was removed, and libtool now ++ # generates 2 separate objects for the 2 libraries. These two ++ # compilations output dependencies in $dir.libs/$base.o.d and ++ # in $dir$base.o.d. We have to check for both files, because ++ # one of the two compilations can be disabled. We should prefer ++ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is ++ # automatically cleaned when .libs/ is deleted, while ignoring ++ # the former would cause a distcleancheck panic. ++ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 ++ tmpdepfile2=$dir$base.o.d # libtool 1.5 ++ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 ++ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else +- tmpdepfile1="$dir$base.o.d" +- tmpdepfile2="$dir$base.d" ++ tmpdepfile1=$dir$base.o.d ++ tmpdepfile2=$dir$base.d ++ tmpdepfile3=$dir$base.d ++ tmpdepfile4=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else +- rm -f "$tmpdepfile1" "$tmpdepfile2" ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + exit $stat + fi + +- if test -f "$tmpdepfile1"; then +- tmpdepfile="$tmpdepfile1" +- else +- tmpdepfile="$tmpdepfile2" +- fi ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" ++ do ++ test -f "$tmpdepfile" && break ++ done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. +@@ -336,7 +416,7 @@ + + # Remove the call to Libtool. + if test "$libtool" = yes; then +- while test $1 != '--mode=compile'; do ++ while test "X$1" != 'X--mode=compile'; do + shift + done + shift +@@ -387,32 +467,39 @@ + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then +- while test $1 != '--mode=compile'; do ++ while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + # X makedepend + shift +- cleared=no +- for arg in "$@"; do ++ cleared=no eat=no ++ for arg ++ do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac ++ if test $eat = yes; then ++ eat=no ++ continue ++ fi + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. ++ -arch) ++ eat=yes ;; + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done +- obj_suffix="`echo $object | sed 's/^.*\././'`" ++ obj_suffix=`echo "$object" | sed 's/^.*\././'` + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" +@@ -432,7 +519,7 @@ + + # Remove the call to Libtool. + if test "$libtool" = yes; then +- while test $1 != '--mode=compile'; do ++ while test "X$1" != 'X--mode=compile'; do + shift + done + shift +@@ -458,7 +545,8 @@ + done + + "$@" -E | +- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | ++ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ ++ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" +@@ -469,13 +557,27 @@ + + msvisualcpp) + # Important note: in order to support this mode, a compiler *must* +- # always write the preprocessed file to stdout, regardless of -o, +- # because we must use -o when running libtool. ++ # always write the preprocessed file to stdout. + "$@" || exit $? ++ ++ # Remove the call to Libtool. ++ if test "$libtool" = yes; then ++ while test "X$1" != 'X--mode=compile'; do ++ shift ++ done ++ shift ++ fi ++ + IFS=" " + for arg + do + case "$arg" in ++ -o) ++ shift ++ ;; ++ $object) ++ shift ++ ;; + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift +@@ -488,16 +590,23 @@ + ;; + esac + done +- "$@" -E | +- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" ++ "$@" -E 2>/dev/null | ++ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" +- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" ++ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" +- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" ++ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + ++msvcmsys) ++ # This case exists only to let depend.m4 do its work. It works by ++ # looking at the text of this script. This case will never be run, ++ # since it is checked for above. ++ exit 1 ++ ;; ++ + none) + exec "$@" + ;; +@@ -516,5 +625,6 @@ + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-end: "$" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" + # End: +diff -r 3c8a74e0c599 config/install-sh +--- a/config/install-sh Sun Apr 11 12:41:30 2010 +0200 ++++ b/config/install-sh Sun Apr 11 16:31:36 2010 +0200 +@@ -1,7 +1,7 @@ + #!/bin/sh + # install - install a program, script, or datafile + +-scriptversion=2004-02-15.20 ++scriptversion=2009-04-28.21; # UTC + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +@@ -39,120 +39,157 @@ + # when there is no Makefile. + # + # This script is compatible with the BSD install script, but was written +-# from scratch. It can only install one file at a time, a restriction +-# shared with many OS's install programs. ++# from scratch. ++ ++nl=' ++' ++IFS=" "" $nl" + + # set DOITPROG to echo to test this script + + # Don't use :- since 4.3BSD and earlier shells don't like it. +-doit="${DOITPROG-}" ++doit=${DOITPROG-} ++if test -z "$doit"; then ++ doit_exec=exec ++else ++ doit_exec=$doit ++fi + +-# put in absolute paths if you don't have them in your path; or use env. vars. ++# Put in absolute file names if you don't have them in your path; ++# or use environment vars. + +-mvprog="${MVPROG-mv}" +-cpprog="${CPPROG-cp}" +-chmodprog="${CHMODPROG-chmod}" +-chownprog="${CHOWNPROG-chown}" +-chgrpprog="${CHGRPPROG-chgrp}" +-stripprog="${STRIPPROG-strip}" +-rmprog="${RMPROG-rm}" +-mkdirprog="${MKDIRPROG-mkdir}" ++chgrpprog=${CHGRPPROG-chgrp} ++chmodprog=${CHMODPROG-chmod} ++chownprog=${CHOWNPROG-chown} ++cmpprog=${CMPPROG-cmp} ++cpprog=${CPPROG-cp} ++mkdirprog=${MKDIRPROG-mkdir} ++mvprog=${MVPROG-mv} ++rmprog=${RMPROG-rm} ++stripprog=${STRIPPROG-strip} + +-transformbasename= +-transform_arg= +-instcmd="$mvprog" +-chmodcmd="$chmodprog 0755" ++posix_glob='?' ++initialize_posix_glob=' ++ test "$posix_glob" != "?" || { ++ if (set -f) 2>/dev/null; then ++ posix_glob= ++ else ++ posix_glob=: ++ fi ++ } ++' ++ ++posix_mkdir= ++ ++# Desired mode of installed file. ++mode=0755 ++ ++chgrpcmd= ++chmodcmd=$chmodprog + chowncmd= +-chgrpcmd= ++mvcmd=$mvprog ++rmcmd="$rmprog -f" + stripcmd= +-rmcmd="$rmprog -f" +-mvcmd="$mvprog" ++ + src= + dst= + dir_arg= ++dst_arg= + +-usage="Usage: $0 [OPTION]... SRCFILE DSTFILE ++copy_on_change=false ++no_target_directory= ++ ++usage="\ ++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY +- or: $0 -d DIRECTORIES... ++ or: $0 [OPTION]... -t DIRECTORY SRCFILES... ++ or: $0 [OPTION]... -d DIRECTORIES... + +-In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default. +-In the second, create the directory path DIR. ++In the 1st form, copy SRCFILE to DSTFILE. ++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ++In the 4th, create DIRECTORIES. + + Options: +--b=TRANSFORMBASENAME +--c copy source (using $cpprog) instead of moving (using $mvprog). +--d create directories instead of installing files. +--g GROUP $chgrp installed files to GROUP. +--m MODE $chmod installed files to MODE. +--o USER $chown installed files to USER. +--s strip installed files (using $stripprog). +--t=TRANSFORM +---help display this help and exit. +---version display version info and exit. ++ --help display this help and exit. ++ --version display version info and exit. ++ ++ -c (ignored) ++ -C install only if different (preserve the last data modification time) ++ -d create directories instead of installing files. ++ -g GROUP $chgrpprog installed files to GROUP. ++ -m MODE $chmodprog installed files to MODE. ++ -o USER $chownprog installed files to USER. ++ -s $stripprog installed files. ++ -t DIRECTORY install into DIRECTORY. ++ -T report an error if DSTFILE is a directory. + + Environment variables override the default commands: +- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG ++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG ++ RMPROG STRIPPROG + " + +-while test -n "$1"; do ++while test $# -ne 0; do + case $1 in +- -b=*) transformbasename=`echo $1 | sed 's/-b=//'` +- shift +- continue;; ++ -c) ;; + +- -c) instcmd=$cpprog +- shift +- continue;; ++ -C) copy_on_change=true;; + +- -d) dir_arg=true +- shift +- continue;; ++ -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" +- shift +- shift +- continue;; ++ shift;; + +- --help) echo "$usage"; exit 0;; ++ --help) echo "$usage"; exit $?;; + +- -m) chmodcmd="$chmodprog $2" +- shift +- shift +- continue;; ++ -m) mode=$2 ++ case $mode in ++ *' '* | *' '* | *' ++'* | *'*'* | *'?'* | *'['*) ++ echo "$0: invalid mode: $mode" >&2 ++ exit 1;; ++ esac ++ shift;; + + -o) chowncmd="$chownprog $2" +- shift +- shift +- continue;; ++ shift;; + +- -s) stripcmd=$stripprog +- shift +- continue;; ++ -s) stripcmd=$stripprog;; + +- -t=*) transformarg=`echo $1 | sed 's/-t=//'` +- shift +- continue;; ++ -t) dst_arg=$2 ++ shift;; + +- --version) echo "$0 $scriptversion"; exit 0;; ++ -T) no_target_directory=true;; + +- *) # When -d is used, all remaining arguments are directories to create. +- test -n "$dir_arg" && break +- # Otherwise, the last argument is the destination. Remove it from $@. +- for arg +- do +- if test -n "$dstarg"; then +- # $@ is not empty: it contains at least $arg. +- set fnord "$@" "$dstarg" +- shift # fnord +- fi +- shift # arg +- dstarg=$arg +- done ++ --version) echo "$0 $scriptversion"; exit $?;; ++ ++ --) shift + break;; ++ ++ -*) echo "$0: invalid option: $1" >&2 ++ exit 1;; ++ ++ *) break;; + esac ++ shift + done + +-if test -z "$1"; then ++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then ++ # When -d is used, all remaining arguments are directories to create. ++ # When -t is used, the destination is already specified. ++ # Otherwise, the last argument is the destination. Remove it from $@. ++ for arg ++ do ++ if test -n "$dst_arg"; then ++ # $@ is not empty: it contains at least $arg. ++ set fnord "$@" "$dst_arg" ++ shift # fnord ++ fi ++ shift # arg ++ dst_arg=$arg ++ done ++fi ++ ++if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 +@@ -162,25 +199,48 @@ + exit 0 + fi + ++if test -z "$dir_arg"; then ++ trap '(exit $?); exit' 1 2 13 15 ++ ++ # Set umask so as not to create temps with too-generous modes. ++ # However, 'strip' requires both read and write access to temps. ++ case $mode in ++ # Optimize common cases. ++ *644) cp_umask=133;; ++ *755) cp_umask=22;; ++ ++ *[0-7]) ++ if test -z "$stripcmd"; then ++ u_plus_rw= ++ else ++ u_plus_rw='% 200' ++ fi ++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; ++ *) ++ if test -z "$stripcmd"; then ++ u_plus_rw= ++ else ++ u_plus_rw=,u+rw ++ fi ++ cp_umask=$mode$u_plus_rw;; ++ esac ++fi ++ + for src + do + # Protect names starting with `-'. + case $src in +- -*) src=./$src ;; ++ -*) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src +- src= ++ dstdir=$dst ++ test -d "$dstdir" ++ dstdir_status=$? ++ else + +- if test -d "$dst"; then +- instcmd=: +- chmodcmd= +- else +- instcmd=$mkdirprog +- fi +- else +- # Waiting for this to be detected by the "$instcmd $src $dsttmp" command ++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then +@@ -188,129 +248,273 @@ + exit 1 + fi + +- if test -z "$dstarg"; then ++ if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + +- dst=$dstarg ++ dst=$dst_arg + # Protect names starting with `-'. + case $dst in +- -*) dst=./$dst ;; ++ -*) dst=./$dst;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then +- dst=$dst/`basename "$src"` ++ if test -n "$no_target_directory"; then ++ echo "$0: $dst_arg: Is a directory" >&2 ++ exit 1 ++ fi ++ dstdir=$dst ++ dst=$dstdir/`basename "$src"` ++ dstdir_status=0 ++ else ++ # Prefer dirname, but fall back on a substitute if dirname fails. ++ dstdir=` ++ (dirname "$dst") 2>/dev/null || ++ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$dst" : 'X\(//\)[^/]' \| \ ++ X"$dst" : 'X\(//\)$' \| \ ++ X"$dst" : 'X\(/\)' \| . 2>/dev/null || ++ echo X"$dst" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q' ++ ` ++ ++ test -d "$dstdir" ++ dstdir_status=$? + fi + fi + +- # This sed command emulates the dirname command. +- dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` ++ obsolete_mkdir_used=false + +- # Make sure that the destination directory exists. ++ if test $dstdir_status != 0; then ++ case $posix_mkdir in ++ '') ++ # Create intermediate dirs using mode 755 as modified by the umask. ++ # This is like FreeBSD 'install' as of 1997-10-28. ++ umask=`umask` ++ case $stripcmd.$umask in ++ # Optimize common cases. ++ *[2367][2367]) mkdir_umask=$umask;; ++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + +- # Skip lots of stat calls in the usual case. +- if test ! -d "$dstdir"; then +- defaultIFS=' +- ' +- IFS="${IFS-$defaultIFS}" ++ *[0-7]) ++ mkdir_umask=`expr $umask + 22 \ ++ - $umask % 100 % 40 + $umask % 20 \ ++ - $umask % 10 % 4 + $umask % 2 ++ `;; ++ *) mkdir_umask=$umask,go-w;; ++ esac + +- oIFS=$IFS +- # Some sh's can't handle IFS=/ for some reason. +- IFS='%' +- set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` +- IFS=$oIFS ++ # With -d, create the new directory with the user-specified mode. ++ # Otherwise, rely on $mkdir_umask. ++ if test -n "$dir_arg"; then ++ mkdir_mode=-m$mode ++ else ++ mkdir_mode= ++ fi + +- pathcomp= ++ posix_mkdir=false ++ case $umask in ++ *[123567][0-7][0-7]) ++ # POSIX mkdir -p sets u+wx bits regardless of umask, which ++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ++ ;; ++ *) ++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ ++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + +- while test $# -ne 0 ; do +- pathcomp=$pathcomp$1 ++ if (umask $mkdir_umask && ++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 ++ then ++ if test -z "$dir_arg" || { ++ # Check for POSIX incompatibilities with -m. ++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or ++ # other-writeable bit of parent directory when it shouldn't. ++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ++ ls_ld_tmpdir=`ls -ld "$tmpdir"` ++ case $ls_ld_tmpdir in ++ d????-?r-*) different_mode=700;; ++ d????-?--*) different_mode=755;; ++ *) false;; ++ esac && ++ $mkdirprog -m$different_mode -p -- "$tmpdir" && { ++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"` ++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" ++ } ++ } ++ then posix_mkdir=: ++ fi ++ rmdir "$tmpdir/d" "$tmpdir" ++ else ++ # Remove any dirs left behind by ancient mkdir implementations. ++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null ++ fi ++ trap '' 0;; ++ esac;; ++ esac ++ ++ if ++ $posix_mkdir && ( ++ umask $mkdir_umask && ++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ++ ) ++ then : ++ else ++ ++ # The umask is ridiculous, or mkdir does not conform to POSIX, ++ # or it failed possibly due to a race condition. Create the ++ # directory the slow way, step by step, checking for races as we go. ++ ++ case $dstdir in ++ /*) prefix='/';; ++ -*) prefix='./';; ++ *) prefix='';; ++ esac ++ ++ eval "$initialize_posix_glob" ++ ++ oIFS=$IFS ++ IFS=/ ++ $posix_glob set -f ++ set fnord $dstdir + shift +- if test ! -d "$pathcomp"; then +- $mkdirprog "$pathcomp" || lasterr=$? +- # mkdir can fail with a `File exist' error in case several +- # install-sh are creating the directory concurrently. This +- # is OK. +- test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; } ++ $posix_glob set +f ++ IFS=$oIFS ++ ++ prefixes= ++ ++ for d ++ do ++ test -z "$d" && continue ++ ++ prefix=$prefix$d ++ if test -d "$prefix"; then ++ prefixes= ++ else ++ if $posix_mkdir; then ++ (umask=$mkdir_umask && ++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break ++ # Don't fail if two instances are running concurrently. ++ test -d "$prefix" || exit 1 ++ else ++ case $prefix in ++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; ++ *) qprefix=$prefix;; ++ esac ++ prefixes="$prefixes '$qprefix'" ++ fi ++ fi ++ prefix=$prefix/ ++ done ++ ++ if test -n "$prefixes"; then ++ # Don't fail if two instances are running concurrently. ++ (umask $mkdir_umask && ++ eval "\$doit_exec \$mkdirprog $prefixes") || ++ test -d "$dstdir" || exit 1 ++ obsolete_mkdir_used=true + fi +- pathcomp=$pathcomp/ +- done ++ fi + fi + + if test -n "$dir_arg"; then +- $doit $instcmd "$dst" \ +- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ +- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ +- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ +- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } +- ++ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && ++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && ++ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || ++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else +- # If we're going to rename the final executable, determine the name now. +- if test -z "$transformarg"; then +- dstfile=`basename "$dst"` +- else +- dstfile=`basename "$dst" $transformbasename \ +- | sed $transformarg`$transformbasename +- fi +- +- # don't allow the sed command to completely eliminate the filename. +- test -z "$dstfile" && dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. +- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 +- trap '(exit $?); exit' 1 2 13 15 ++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + +- # Move or copy the file name to the temp name +- $doit $instcmd "$src" "$dsttmp" && ++ # Copy the file name to the temp name. ++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore +- # errors from the above "$doit $instcmd $src $dsttmp" command. ++ # errors from the above "$doit $cpprog $src $dsttmp" command. + # +- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ +- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ +- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ +- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && ++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && ++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && ++ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && ++ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + +- # Now remove or move aside any old file at destination location. We +- # try this two ways since rm can't unlink itself on some systems and +- # the destination file might be busy for other reasons. In this case, +- # the final cleanup might fail but the new file should still install +- # successfully. +- { +- if test -f "$dstdir/$dstfile"; then +- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ +- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ +- || { +- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 +- (exit 1); exit +- } +- else +- : +- fi +- } && ++ # If -C, don't bother to copy if it wouldn't change the file. ++ if $copy_on_change && ++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && ++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + +- # Now rename the file to the real destination. +- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" +- fi || { (exit 1); exit; } ++ eval "$initialize_posix_glob" && ++ $posix_glob set -f && ++ set X $old && old=:$2:$4:$5:$6 && ++ set X $new && new=:$2:$4:$5:$6 && ++ $posix_glob set +f && ++ ++ test "$old" = "$new" && ++ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 ++ then ++ rm -f "$dsttmp" ++ else ++ # Rename the file to the real destination. ++ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || ++ ++ # The rename failed, perhaps because mv can't rename something else ++ # to itself, or perhaps because mv is so ancient that it does not ++ # support -f. ++ { ++ # Now remove or move aside any old file at destination location. ++ # We try this two ways since rm can't unlink itself on some ++ # systems and the destination file might be busy for other ++ # reasons. In this case, the final cleanup might fail but the new ++ # file should still install successfully. ++ { ++ test ! -f "$dst" || ++ $doit $rmcmd -f "$dst" 2>/dev/null || ++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && ++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } ++ } || ++ { echo "$0: cannot unlink or rename $dst" >&2 ++ (exit 1); exit 1 ++ } ++ } && ++ ++ # Now rename the file to the real destination. ++ $doit $mvcmd "$dsttmp" "$dst" ++ } ++ fi || exit 1 ++ ++ trap '' 0 ++ fi + done + +-# The final little trick to "correctly" pass the exit status to the exit trap. +-{ +- (exit 0); exit +-} +- + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-end: "$" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" + # End: +diff -r 3c8a74e0c599 config/kbuild.mak.in +--- a/config/kbuild.mak.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/config/kbuild.mak.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,7 +1,7 @@ + # Here are the configuration bits needed in the "caller" to use this file + #SUBDIR = vmadump4 + #TARGET = vmadump +-#SOURCES = vmadump_common.c vmadump_@CR_ARCH@.c optional.h ++#SOURCES = vmadump_common.c vmadump_@CR_KARCH@.c optional.h + #[optional]EXTRA_CFLAGS = -I$(top_builddir)/include -I$(top_builddir) -I$(srcdir) + #[optional]IMPORTS_FROM = /some/other/kbuild/module/dir /and/another + # +@@ -26,7 +26,7 @@ + # Remove headers from the list of sources, and sort to remove possible duplicates + DOT_C := $(sort $(filter %.c,$(SOURCES))) + +-ifeq ($(TOPDIR),) ++ifeq ($(srctree),) + # not within KBUILD - implement automake's standard goals + + all: $(LINUX_OBJ)/.config prepare +diff -r 3c8a74e0c599 config/ltmain.sh +--- a/config/ltmain.sh Sun Apr 11 12:41:30 2010 +0200 ++++ b/config/ltmain.sh Sun Apr 11 16:31:36 2010 +0200 +@@ -1,42 +1,574 @@ +-# ltmain.sh - Provide generalized library-building support services. +-# NOTE: Changing this file will not affect anything until you rerun configure. +-# +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003 +-# Free Software Foundation, Inc. +-# Originally by Gordon Matzigkeit , 1996 +-# +-# This program is free software; you can redistribute it and/or modify ++# Generated from ltmain.m4sh. ++ ++# ltmain.sh (GNU libtool) 2.2.6b ++# Written by Gordon Matzigkeit , 1996 ++ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. ++# This is free software; see the source for copying conditions. There is NO ++# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ ++# GNU Libtool 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 ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool 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. ++# along with GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, ++# or obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ ++# Usage: $progname [OPTION]... [MODE-ARG]... + # +-# 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. +- +-# Check that we have a working $echo. ++# Provide generalized library-building support services. ++# ++# --config show all configuration variables ++# --debug enable verbose shell tracing ++# -n, --dry-run display commands without modifying any files ++# --features display basic configuration information and exit ++# --mode=MODE use operation mode MODE ++# --preserve-dup-deps don't remove duplicate dependency libraries ++# --quiet, --silent don't print informational messages ++# --tag=TAG use configuration variables from tag TAG ++# -v, --verbose print informational messages (default) ++# --version print version information ++# -h, --help print short or long help message ++# ++# MODE must be one of the following: ++# ++# clean remove files from the build directory ++# compile compile a source file into a libtool object ++# execute automatically set library path, then run a program ++# finish complete the installation of libtool libraries ++# install install libraries or executables ++# link create a library or an executable ++# uninstall remove libraries from an installed directory ++# ++# MODE-ARGS vary depending on the MODE. ++# Try `$progname --help --mode=MODE' for a more detailed description of MODE. ++# ++# When reporting a bug, please describe a test case to reproduce it and ++# include the following information: ++# ++# host-triplet: $host ++# shell: $SHELL ++# compiler: $LTCC ++# compiler flags: $LTCFLAGS ++# linker: $LD (gnu? $with_gnu_ld) ++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2 ++# automake: $automake_version ++# autoconf: $autoconf_version ++# ++# Report bugs to . ++ ++PROGRAM=ltmain.sh ++PACKAGE=libtool ++VERSION="2.2.6b Debian-2.2.6b-2" ++TIMESTAMP="" ++package_revision=1.3017 ++ ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++# NLS nuisances: We save the old values to restore during execute mode. ++# Only set LANG and LC_ALL to C if already set. ++# These must not be set unconditionally because not all systems understand ++# e.g. LANG=C (notably SCO). ++lt_user_locale= ++lt_safe_locale= ++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++do ++ eval "if test \"\${$lt_var+set}\" = set; then ++ save_$lt_var=\$$lt_var ++ $lt_var=C ++ export $lt_var ++ lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" ++ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" ++ fi" ++done ++ ++$lt_unset CDPATH ++ ++ ++ ++ ++ ++: ${CP="cp -f"} ++: ${ECHO="echo"} ++: ${EGREP="/bin/grep -E"} ++: ${FGREP="/bin/grep -F"} ++: ${GREP="/bin/grep"} ++: ${LN_S="ln -s"} ++: ${MAKE="make"} ++: ${MKDIR="mkdir"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++: ${SED="/bin/sed"} ++: ${SHELL="${CONFIG_SHELL-/bin/sh}"} ++: ${Xsed="$SED -e 1s/^X//"} ++ ++# Global variables: ++EXIT_SUCCESS=0 ++EXIT_FAILURE=1 ++EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. ++EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. ++ ++exit_status=$EXIT_SUCCESS ++ ++# Make sure IFS has a sensible default ++lt_nl=' ++' ++IFS=" $lt_nl" ++ ++dirname="s,/[^/]*$,," ++basename="s,^.*/,," ++ ++# func_dirname_and_basename file append nondir_replacement ++# perform func_basename and func_dirname in a single function ++# call: ++# dirname: Compute the dirname of FILE. If nonempty, ++# add APPEND to the result, otherwise set result ++# to NONDIR_REPLACEMENT. ++# value returned in "$func_dirname_result" ++# basename: Compute filename of FILE. ++# value retuned in "$func_basename_result" ++# Implementation must be kept synchronized with func_dirname ++# and func_basename. For efficiency, we do not delegate to ++# those functions but instead duplicate the functionality here. ++func_dirname_and_basename () ++{ ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` ++} ++ ++# Generated shell functions inserted here. ++ ++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh ++# is ksh but when the shell is invoked as "sh" and the current value of ++# the _XPG environment variable is not equal to 1 (one), the special ++# positional parameter $0, within a function call, is the name of the ++# function. ++progpath="$0" ++ ++# The name of this program: ++# In the unlikely event $progname began with a '-', it would play havoc with ++# func_echo (imagine progname=-n), so we prepend ./ in that case: ++func_dirname_and_basename "$progpath" ++progname=$func_basename_result ++case $progname in ++ -*) progname=./$progname ;; ++esac ++ ++# Make sure we have an absolute path for reexecution: ++case $progpath in ++ [\\/]*|[A-Za-z]:\\*) ;; ++ *[\\/]*) ++ progdir=$func_dirname_result ++ progdir=`cd "$progdir" && pwd` ++ progpath="$progdir/$progname" ++ ;; ++ *) ++ save_IFS="$IFS" ++ IFS=: ++ for progdir in $PATH; do ++ IFS="$save_IFS" ++ test -x "$progdir/$progname" && break ++ done ++ IFS="$save_IFS" ++ test -n "$progdir" || progdir=`pwd` ++ progpath="$progdir/$progname" ++ ;; ++esac ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed="${SED}"' -e 1s/^X//' ++sed_quote_subst='s/\([`"$\\]\)/\\\1/g' ++ ++# Same as above, but do not quote variable references. ++double_quote_subst='s/\(["`\\]\)/\\\1/g' ++ ++# Re-`\' parameter expansions in output of double_quote_subst that were ++# `\'-ed in input to the same. If an odd number of `\' preceded a '$' ++# in input to double_quote_subst, that '$' was protected from expansion. ++# Since each input `\' is now two `\'s, look for any number of runs of ++# four `\'s followed by two `\'s and then a '$'. `\' that '$'. ++bs='\\' ++bs2='\\\\' ++bs4='\\\\\\\\' ++dollar='\$' ++sed_double_backslash="\ ++ s/$bs4/&\\ ++/g ++ s/^$bs2$dollar/$bs&/ ++ s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g ++ s/\n//g" ++ ++# Standard options: ++opt_dry_run=false ++opt_help=false ++opt_quiet=false ++opt_verbose=false ++opt_warning=: ++ ++# func_echo arg... ++# Echo program name prefixed message, along with the current mode ++# name if it has been set yet. ++func_echo () ++{ ++ $ECHO "$progname${mode+: }$mode: $*" ++} ++ ++# func_verbose arg... ++# Echo program name prefixed message in verbose mode only. ++func_verbose () ++{ ++ $opt_verbose && func_echo ${1+"$@"} ++ ++ # A bug in bash halts the script if the last line of a function ++ # fails when set -e is in force, so we need another command to ++ # work around that: ++ : ++} ++ ++# func_error arg... ++# Echo program name prefixed message to standard error. ++func_error () ++{ ++ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 ++} ++ ++# func_warning arg... ++# Echo program name prefixed warning message to standard error. ++func_warning () ++{ ++ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 ++ ++ # bash bug again: ++ : ++} ++ ++# func_fatal_error arg... ++# Echo program name prefixed message to standard error, and exit. ++func_fatal_error () ++{ ++ func_error ${1+"$@"} ++ exit $EXIT_FAILURE ++} ++ ++# func_fatal_help arg... ++# Echo program name prefixed message to standard error, followed by ++# a help hint, and exit. ++func_fatal_help () ++{ ++ func_error ${1+"$@"} ++ func_fatal_error "$help" ++} ++help="Try \`$progname --help' for more information." ## default ++ ++ ++# func_grep expression filename ++# Check whether EXPRESSION matches any line of FILENAME, without output. ++func_grep () ++{ ++ $GREP "$1" "$2" >/dev/null 2>&1 ++} ++ ++ ++# func_mkdir_p directory-path ++# Make sure the entire path to DIRECTORY-PATH is available. ++func_mkdir_p () ++{ ++ my_directory_path="$1" ++ my_dir_list= ++ ++ if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then ++ ++ # Protect directory names starting with `-' ++ case $my_directory_path in ++ -*) my_directory_path="./$my_directory_path" ;; ++ esac ++ ++ # While some portion of DIR does not yet exist... ++ while test ! -d "$my_directory_path"; do ++ # ...make a list in topmost first order. Use a colon delimited ++ # list incase some portion of path contains whitespace. ++ my_dir_list="$my_directory_path:$my_dir_list" ++ ++ # If the last portion added has no slash in it, the list is done ++ case $my_directory_path in */*) ;; *) break ;; esac ++ ++ # ...otherwise throw away the child directory and loop ++ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` ++ done ++ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` ++ ++ save_mkdir_p_IFS="$IFS"; IFS=':' ++ for my_dir in $my_dir_list; do ++ IFS="$save_mkdir_p_IFS" ++ # mkdir can fail with a `File exist' error if two processes ++ # try to create one of the directories concurrently. Don't ++ # stop in that case! ++ $MKDIR "$my_dir" 2>/dev/null || : ++ done ++ IFS="$save_mkdir_p_IFS" ++ ++ # Bail out if we (or some other process) failed to create a directory. ++ test -d "$my_directory_path" || \ ++ func_fatal_error "Failed to create \`$1'" ++ fi ++} ++ ++ ++# func_mktempdir [string] ++# Make a temporary directory that won't clash with other running ++# libtool processes, and avoids race conditions if possible. If ++# given, STRING is the basename for that directory. ++func_mktempdir () ++{ ++ my_template="${TMPDIR-/tmp}/${1-$progname}" ++ ++ if test "$opt_dry_run" = ":"; then ++ # Return a directory name, but don't create it in dry-run mode ++ my_tmpdir="${my_template}-$$" ++ else ++ ++ # If mktemp works, use that first and foremost ++ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` ++ ++ if test ! -d "$my_tmpdir"; then ++ # Failing that, at least try and use $RANDOM to avoid a race ++ my_tmpdir="${my_template}-${RANDOM-0}$$" ++ ++ save_mktempdir_umask=`umask` ++ umask 0077 ++ $MKDIR "$my_tmpdir" ++ umask $save_mktempdir_umask ++ fi ++ ++ # If we're not in dry-run mode, bomb out on failure ++ test -d "$my_tmpdir" || \ ++ func_fatal_error "cannot create temporary directory \`$my_tmpdir'" ++ fi ++ ++ $ECHO "X$my_tmpdir" | $Xsed ++} ++ ++ ++# func_quote_for_eval arg ++# Aesthetically quote ARG to be evaled later. ++# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT ++# is double-quoted, suitable for a subsequent eval, whereas ++# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters ++# which are still active within double quotes backslashified. ++func_quote_for_eval () ++{ ++ case $1 in ++ *[\\\`\"\$]*) ++ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; ++ *) ++ func_quote_for_eval_unquoted_result="$1" ;; ++ esac ++ ++ case $func_quote_for_eval_unquoted_result in ++ # Double-quote args containing shell metacharacters to delay ++ # word splitting, command substitution and and variable ++ # expansion for a subsequent eval. ++ # Many Bourne shells cannot handle close brackets correctly ++ # in scan sets, so we specify it separately. ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" ++ ;; ++ *) ++ func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" ++ esac ++} ++ ++ ++# func_quote_for_expand arg ++# Aesthetically quote ARG to be evaled later; same as above, ++# but do not quote variable references. ++func_quote_for_expand () ++{ ++ case $1 in ++ *[\\\`\"]*) ++ my_arg=`$ECHO "X$1" | $Xsed \ ++ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; ++ *) ++ my_arg="$1" ;; ++ esac ++ ++ case $my_arg in ++ # Double-quote args containing shell metacharacters to delay ++ # word splitting and command substitution for a subsequent eval. ++ # Many Bourne shells cannot handle close brackets correctly ++ # in scan sets, so we specify it separately. ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ my_arg="\"$my_arg\"" ++ ;; ++ esac ++ ++ func_quote_for_expand_result="$my_arg" ++} ++ ++ ++# func_show_eval cmd [fail_exp] ++# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is ++# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP ++# is given, then evaluate it. ++func_show_eval () ++{ ++ my_cmd="$1" ++ my_fail_exp="${2-:}" ++ ++ ${opt_silent-false} || { ++ func_quote_for_expand "$my_cmd" ++ eval "func_echo $func_quote_for_expand_result" ++ } ++ ++ if ${opt_dry_run-false}; then :; else ++ eval "$my_cmd" ++ my_status=$? ++ if test "$my_status" -eq 0; then :; else ++ eval "(exit $my_status); $my_fail_exp" ++ fi ++ fi ++} ++ ++ ++# func_show_eval_locale cmd [fail_exp] ++# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is ++# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP ++# is given, then evaluate it. Use the saved locale for evaluation. ++func_show_eval_locale () ++{ ++ my_cmd="$1" ++ my_fail_exp="${2-:}" ++ ++ ${opt_silent-false} || { ++ func_quote_for_expand "$my_cmd" ++ eval "func_echo $func_quote_for_expand_result" ++ } ++ ++ if ${opt_dry_run-false}; then :; else ++ eval "$lt_user_locale ++ $my_cmd" ++ my_status=$? ++ eval "$lt_safe_locale" ++ if test "$my_status" -eq 0; then :; else ++ eval "(exit $my_status); $my_fail_exp" ++ fi ++ fi ++} ++ ++ ++ ++ ++ ++# func_version ++# Echo version message to standard output and exit. ++func_version () ++{ ++ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { ++ s/^# // ++ s/^# *$// ++ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ ++ p ++ }' < "$progpath" ++ exit $? ++} ++ ++# func_usage ++# Echo short help message to standard output and exit. ++func_usage () ++{ ++ $SED -n '/^# Usage:/,/# -h/ { ++ s/^# // ++ s/^# *$// ++ s/\$progname/'$progname'/ ++ p ++ }' < "$progpath" ++ $ECHO ++ $ECHO "run \`$progname --help | more' for full usage" ++ exit $? ++} ++ ++# func_help ++# Echo long help message to standard output and exit. ++func_help () ++{ ++ $SED -n '/^# Usage:/,/# Report bugs to/ { ++ s/^# // ++ s/^# *$// ++ s*\$progname*'$progname'* ++ s*\$host*'"$host"'* ++ s*\$SHELL*'"$SHELL"'* ++ s*\$LTCC*'"$LTCC"'* ++ s*\$LTCFLAGS*'"$LTCFLAGS"'* ++ s*\$LD*'"$LD"'* ++ s/\$with_gnu_ld/'"$with_gnu_ld"'/ ++ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ ++ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ ++ p ++ }' < "$progpath" ++ exit $? ++} ++ ++# func_missing_arg argname ++# Echo program name prefixed message to standard error and set global ++# exit_cmd. ++func_missing_arg () ++{ ++ func_error "missing argument for $1" ++ exit_cmd=exit ++} ++ ++exit_cmd=: ++ ++ ++ ++ ++ ++# Check that we have a working $ECHO. + if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then +- # Yippee, $echo works! ++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then ++ # Yippee, $ECHO works! + : + else +- # Restart under the correct shell, and then maybe $echo will work. +- exec $SHELL "$0" --no-reexec ${1+"$@"} ++ # Restart under the correct shell, and then maybe $ECHO will work. ++ exec $SHELL "$progpath" --no-reexec ${1+"$@"} + fi + + if test "X$1" = X--fallback-echo; then +@@ -45,496 +577,464 @@ + cat <&2 +- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 +- exit 1 +-fi ++magic_exe="%%%MAGIC EXE variable%%%" + + # Global variables. +-mode=$default_mode ++# $mode is unset + nonopt= +-prev= +-prevopt= +-run= +-show="$echo" +-show_help= + execute_dlfiles= ++preserve_args= + lo2o="s/\\.lo\$/.${objext}/" + o2lo="s/\\.${objext}\$/.lo/" +- +-##################################### +-# Shell function definitions: +-# This seems to be the best place for them +- +-# Need a lot of goo to handle *both* DLLs and import libs +-# Has to be a shell function in order to 'eat' the argument +-# that is supplied when $file_magic_command is called. +-win32_libid () { +- win32_libid_type="unknown" +- win32_fileres=`file -L $1 2>/dev/null` +- case $win32_fileres in +- *ar\ archive\ import\ library*) # definitely import +- win32_libid_type="x86 archive import" +- ;; +- *ar\ archive*) # could be an import, or static +- if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ +- grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then +- win32_nmres=`eval $NM -f posix -A $1 | \ +- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` +- if test "X$win32_nmres" = "Ximport" ; then +- win32_libid_type="x86 archive import" +- else +- win32_libid_type="x86 archive static" +- fi +- fi +- ;; +- *DLL*) +- win32_libid_type="x86 DLL" +- ;; +- *executable*) # but shell scripts are "executable" too... +- case $win32_fileres in +- *MS\ Windows\ PE\ Intel*) +- win32_libid_type="x86 DLL" +- ;; +- esac +- ;; +- esac +- $echo $win32_libid_type +-} +- +-# End of Shell function definitions +-##################################### +- +-# Parse our command line options once, thoroughly. +-while test "$#" -gt 0 +-do +- arg="$1" +- shift +- +- case $arg in +- -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; +- *) optarg= ;; +- esac +- +- # If the previous option needs an argument, assign it. +- if test -n "$prev"; then +- case $prev in +- execute_dlfiles) +- execute_dlfiles="$execute_dlfiles $arg" +- ;; +- tag) +- tagname="$arg" +- preserve_args="${preserve_args}=$arg" +- +- # Check whether tagname contains only valid characters +- case $tagname in +- *[!-_A-Za-z0-9,/]*) +- $echo "$progname: invalid tag name: $tagname" 1>&2 +- exit 1 +- ;; +- esac +- +- case $tagname in +- CC) +- # Don't test for the "default" C tag, as we know, it's there, but +- # not specially marked. +- ;; +- *) +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then +- taglist="$taglist $tagname" +- # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`" +- else +- $echo "$progname: ignoring unknown tag $tagname" 1>&2 +- fi +- ;; +- esac +- ;; +- *) +- eval "$prev=\$arg" +- ;; +- esac +- +- prev= +- prevopt= +- continue +- fi +- +- # Have we seen a non-optional argument yet? +- case $arg in +- --help) +- show_help=yes +- ;; +- +- --version) +- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" +- $echo +- $echo "Copyright (C) 2003 Free Software Foundation, Inc." +- $echo "This is free software; see the source for copying conditions. There is NO" +- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +- exit 0 +- ;; +- +- --config) +- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 +- # Now print the configurations for the tags. +- for tagname in $taglist; do +- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0" +- done +- exit 0 +- ;; +- +- --debug) +- $echo "$progname: enabling shell trace mode" +- set -x +- preserve_args="$preserve_args $arg" +- ;; +- +- --dry-run | -n) +- run=: +- ;; +- +- --features) +- $echo "host: $host" +- if test "$build_libtool_libs" = yes; then +- $echo "enable shared libraries" +- else +- $echo "disable shared libraries" +- fi +- if test "$build_old_libs" = yes; then +- $echo "enable static libraries" +- else +- $echo "disable static libraries" +- fi +- exit 0 +- ;; +- +- --finish) mode="finish" ;; +- +- --mode) prevopt="--mode" prev=mode ;; +- --mode=*) mode="$optarg" ;; +- +- --preserve-dup-deps) duplicate_deps="yes" ;; +- +- --quiet | --silent) +- show=: +- preserve_args="$preserve_args $arg" +- ;; +- +- --tag) prevopt="--tag" prev=tag ;; +- --tag=*) +- set tag "$optarg" ${1+"$@"} +- shift +- prev=tag +- preserve_args="$preserve_args --tag" +- ;; +- +- -dlopen) +- prevopt="-dlopen" +- prev=execute_dlfiles +- ;; +- +- -*) +- $echo "$modename: unrecognized option \`$arg'" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- ;; +- +- *) +- nonopt="$arg" +- break +- ;; +- esac +-done +- +-if test -n "$prevopt"; then +- $echo "$modename: option \`$prevopt' requires an argument" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +-fi ++extracted_archives= ++extracted_serial=0 ++ ++opt_dry_run=false ++opt_duplicate_deps=false ++opt_silent=false ++opt_debug=: + + # If this variable is set in any of the actions, the command in it + # will be execed at the end. This prevents here-documents from being + # left over by shells. + exec_cmd= + +-if test -z "$show_help"; then +- +- # Infer the operation mode. +- if test -z "$mode"; then +- $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 +- $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 +- case $nonopt in +- *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) +- mode=link +- for arg +- do +- case $arg in +- -c) +- mode=compile +- break +- ;; +- esac +- done ++# func_fatal_configuration arg... ++# Echo program name prefixed message to standard error, followed by ++# a configuration failure hint, and exit. ++func_fatal_configuration () ++{ ++ func_error ${1+"$@"} ++ func_error "See the $PACKAGE documentation for more information." ++ func_fatal_error "Fatal configuration error." ++} ++ ++ ++# func_config ++# Display the configuration for all the tags in this script. ++func_config () ++{ ++ re_begincf='^# ### BEGIN LIBTOOL' ++ re_endcf='^# ### END LIBTOOL' ++ ++ # Default configuration. ++ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" ++ ++ # Now print the configurations for the tags. ++ for tagname in $taglist; do ++ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" ++ done ++ ++ exit $? ++} ++ ++# func_features ++# Display the features supported by this script. ++func_features () ++{ ++ $ECHO "host: $host" ++ if test "$build_libtool_libs" = yes; then ++ $ECHO "enable shared libraries" ++ else ++ $ECHO "disable shared libraries" ++ fi ++ if test "$build_old_libs" = yes; then ++ $ECHO "enable static libraries" ++ else ++ $ECHO "disable static libraries" ++ fi ++ ++ exit $? ++} ++ ++# func_enable_tag tagname ++# Verify that TAGNAME is valid, and either flag an error and exit, or ++# enable the TAGNAME tag. We also add TAGNAME to the global $taglist ++# variable here. ++func_enable_tag () ++{ ++ # Global variable: ++ tagname="$1" ++ ++ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" ++ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" ++ sed_extractcf="/$re_begincf/,/$re_endcf/p" ++ ++ # Validate tagname. ++ case $tagname in ++ *[!-_A-Za-z0-9,/]*) ++ func_fatal_error "invalid tag name: $tagname" + ;; +- *db | *dbx | *strace | *truss) +- mode=execute ++ esac ++ ++ # Don't test for the "default" C tag, as we know it's ++ # there but not specially marked. ++ case $tagname in ++ CC) ;; ++ *) ++ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then ++ taglist="$taglist $tagname" ++ ++ # Evaluate the configuration. Be careful to quote the path ++ # and the sed script, to avoid splitting on whitespace, but ++ # also don't use non-portable quotes within backquotes within ++ # quotes we have to do it in 2 steps: ++ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` ++ eval "$extractedcf" ++ else ++ func_error "ignoring unknown tag $tagname" ++ fi + ;; +- *install*|cp|mv) +- mode=install +- ;; +- *rm) +- mode=uninstall ++ esac ++} ++ ++# Parse options once, thoroughly. This comes as soon as possible in ++# the script to make things like `libtool --version' happen quickly. ++{ ++ ++ # Shorthand for --mode=foo, only valid as the first argument ++ case $1 in ++ clean|clea|cle|cl) ++ shift; set dummy --mode clean ${1+"$@"}; shift ++ ;; ++ compile|compil|compi|comp|com|co|c) ++ shift; set dummy --mode compile ${1+"$@"}; shift ++ ;; ++ execute|execut|execu|exec|exe|ex|e) ++ shift; set dummy --mode execute ${1+"$@"}; shift ++ ;; ++ finish|finis|fini|fin|fi|f) ++ shift; set dummy --mode finish ${1+"$@"}; shift ++ ;; ++ install|instal|insta|inst|ins|in|i) ++ shift; set dummy --mode install ${1+"$@"}; shift ++ ;; ++ link|lin|li|l) ++ shift; set dummy --mode link ${1+"$@"}; shift ++ ;; ++ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) ++ shift; set dummy --mode uninstall ${1+"$@"}; shift ++ ;; ++ esac ++ ++ # Parse non-mode specific arguments: ++ while test "$#" -gt 0; do ++ opt="$1" ++ shift ++ ++ case $opt in ++ --config) func_config ;; ++ ++ --debug) preserve_args="$preserve_args $opt" ++ func_echo "enabling shell trace mode" ++ opt_debug='set -x' ++ $opt_debug ++ ;; ++ ++ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break ++ execute_dlfiles="$execute_dlfiles $1" ++ shift ++ ;; ++ ++ --dry-run | -n) opt_dry_run=: ;; ++ --features) func_features ;; ++ --finish) mode="finish" ;; ++ ++ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break ++ case $1 in ++ # Valid mode arguments: ++ clean) ;; ++ compile) ;; ++ execute) ;; ++ finish) ;; ++ install) ;; ++ link) ;; ++ relink) ;; ++ uninstall) ;; ++ ++ # Catch anything else as an error ++ *) func_error "invalid argument for $opt" ++ exit_cmd=exit ++ break ++ ;; ++ esac ++ ++ mode="$1" ++ shift ++ ;; ++ ++ --preserve-dup-deps) ++ opt_duplicate_deps=: ;; ++ ++ --quiet|--silent) preserve_args="$preserve_args $opt" ++ opt_silent=: ++ ;; ++ ++ --verbose| -v) preserve_args="$preserve_args $opt" ++ opt_silent=false ++ ;; ++ ++ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break ++ preserve_args="$preserve_args $opt $1" ++ func_enable_tag "$1" # tagname is set here ++ shift ++ ;; ++ ++ # Separate optargs to long options: ++ -dlopen=*|--mode=*|--tag=*) ++ func_opt_split "$opt" ++ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} ++ shift ++ ;; ++ ++ -\?|-h) func_usage ;; ++ --help) opt_help=: ;; ++ --version) func_version ;; ++ ++ -*) func_fatal_help "unrecognized option \`$opt'" ;; ++ ++ *) nonopt="$opt" ++ break ++ ;; ++ esac ++ done ++ ++ ++ case $host in ++ *cygwin* | *mingw* | *pw32* | *cegcc*) ++ # don't eliminate duplications in $postdeps and $predeps ++ opt_duplicate_compiler_generated_deps=: + ;; + *) +- # If we have no mode, but dlfiles were specified, then do execute mode. +- test -n "$execute_dlfiles" && mode=execute +- +- # Just use the default operation mode. +- if test -z "$mode"; then +- if test -n "$nonopt"; then +- $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 +- else +- $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 +- fi ++ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ++ ;; ++ esac ++ ++ # Having warned about all mis-specified options, bail out if ++ # anything was wrong. ++ $exit_cmd $EXIT_FAILURE ++} ++ ++# func_check_version_match ++# Ensure that we are using m4 macros, and libtool script from the same ++# release of libtool. ++func_check_version_match () ++{ ++ if test "$package_revision" != "$macro_revision"; then ++ if test "$VERSION" != "$macro_version"; then ++ if test -z "$macro_version"; then ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from an older release. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF + fi +- ;; +- esac ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, ++$progname: but the definition of this LT_INIT comes from revision $macro_revision. ++$progname: You should recreate aclocal.m4 with macros from revision $package_revision ++$progname: of $PACKAGE $VERSION and run autoconf again. ++_LT_EOF ++ fi ++ ++ exit $EXIT_MISMATCH + fi ++} ++ ++ ++## ----------- ## ++## Main. ## ++## ----------- ## ++ ++$opt_help || { ++ # Sanity checks first: ++ func_check_version_match ++ ++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then ++ func_fatal_configuration "not configured to build any kind of library" ++ fi ++ ++ test -z "$mode" && func_fatal_error "error: you must specify a MODE." ++ ++ ++ # Darwin sucks ++ eval std_shrext=\"$shrext_cmds\" ++ + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$execute_dlfiles" && test "$mode" != execute; then +- $echo "$modename: unrecognized option \`-dlopen'" 1>&2 +- $echo "$help" 1>&2 +- exit 1 ++ func_error "unrecognized option \`-dlopen'" ++ $ECHO "$help" 1>&2 ++ exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help="$help" +- help="Try \`$modename --help --mode=$mode' for more information." +- +- # These modes are in order of execution frequency so that they run quickly. +- case $mode in +- # libtool compile mode +- compile) +- modename="$modename: compile" +- # Get the compilation command and the source file. +- base_compile= +- srcfile="$nonopt" # always keep a non-empty value in "srcfile" +- suppress_opt=yes +- suppress_output= +- arg_mode=normal +- libobj= +- later= +- +- for arg +- do +- case "$arg_mode" in +- arg ) +- # do not "continue". Instead, add this to base_compile +- lastarg="$arg" +- arg_mode=normal +- ;; +- +- target ) +- libobj="$arg" +- arg_mode=normal +- continue +- ;; +- +- normal ) +- # Accept any command-line options. +- case $arg in +- -o) +- if test -n "$libobj" ; then +- $echo "$modename: you cannot specify \`-o' more than once" 1>&2 +- exit 1 +- fi +- arg_mode=target +- continue +- ;; +- +- -static | -prefer-pic | -prefer-non-pic) +- later="$later $arg" +- continue +- ;; +- +- -no-suppress) +- suppress_opt=no +- continue +- ;; +- +- -Xcompiler) +- arg_mode=arg # the next one goes into the "base_compile" arg list +- continue # The current "srcfile" will either be retained or +- ;; # replaced later. I would guess that would be a bug. +- +- -Wc,*) +- args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` +- lastarg= +- save_ifs="$IFS"; IFS=',' +- for arg in $args; do +- IFS="$save_ifs" +- +- # Double-quote args containing other shell metacharacters. +- # Many Bourne shells cannot handle close brackets correctly +- # in scan sets, so we specify it separately. +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" +- ;; ++ help="Try \`$progname --help --mode=$mode' for more information." ++} ++ ++ ++# func_lalib_p file ++# True iff FILE is a libtool `.la' library or `.lo' object file. ++# This function is only a basic sanity check; it will hardly flush out ++# determined imposters. ++func_lalib_p () ++{ ++ test -f "$1" && ++ $SED -e 4q "$1" 2>/dev/null \ ++ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 ++} ++ ++# func_lalib_unsafe_p file ++# True iff FILE is a libtool `.la' library or `.lo' object file. ++# This function implements the same check as func_lalib_p without ++# resorting to external programs. To this end, it redirects stdin and ++# closes it afterwards, without saving the original file descriptor. ++# As a safety measure, use it only where a negative result would be ++# fatal anyway. Works if `file' does not exist. ++func_lalib_unsafe_p () ++{ ++ lalib_p=no ++ if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then ++ for lalib_p_l in 1 2 3 4 ++ do ++ read lalib_p_line ++ case "$lalib_p_line" in ++ \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; + esac +- lastarg="$lastarg $arg" +- done +- IFS="$save_ifs" +- lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` +- +- # Add the arguments to base_compile. +- base_compile="$base_compile $lastarg" +- continue +- ;; +- +- * ) +- # Accept the current argument as the source file. +- # The previous "srcfile" becomes the current argument. +- # +- lastarg="$srcfile" +- srcfile="$arg" +- ;; +- esac # case $arg +- ;; +- esac # case $arg_mode +- +- # Aesthetically quote the previous argument. +- lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` +- +- case $lastarg in +- # Double-quote args containing other shell metacharacters. +- # Many Bourne shells cannot handle close brackets correctly +- # in scan sets, so we specify it separately. +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- lastarg="\"$lastarg\"" +- ;; +- esac +- +- base_compile="$base_compile $lastarg" +- done # for arg +- +- case $arg_mode in +- arg) +- $echo "$modename: you must specify an argument for -Xcompile" +- exit 1 +- ;; +- target) +- $echo "$modename: you must specify a target with \`-o'" 1>&2 +- exit 1 +- ;; +- *) +- # Get the name of the library object. +- [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` +- ;; ++ done ++ exec 0<&5 5<&- ++ fi ++ test "$lalib_p" = yes ++} ++ ++# func_ltwrapper_script_p file ++# True iff FILE is a libtool wrapper script ++# This function is only a basic sanity check; it will hardly flush out ++# determined imposters. ++func_ltwrapper_script_p () ++{ ++ func_lalib_p "$1" ++} ++ ++# func_ltwrapper_executable_p file ++# True iff FILE is a libtool wrapper executable ++# This function is only a basic sanity check; it will hardly flush out ++# determined imposters. ++func_ltwrapper_executable_p () ++{ ++ func_ltwrapper_exec_suffix= ++ case $1 in ++ *.exe) ;; ++ *) func_ltwrapper_exec_suffix=.exe ;; + esac +- +- # Recognize several different file suffixes. +- # If the user specifies -o file.o, it is replaced with file.lo +- xform='[cCFSifmso]' +- case $libobj in +- *.ada) xform=ada ;; +- *.adb) xform=adb ;; +- *.ads) xform=ads ;; +- *.asm) xform=asm ;; +- *.c++) xform=c++ ;; +- *.cc) xform=cc ;; +- *.ii) xform=ii ;; +- *.class) xform=class ;; +- *.cpp) xform=cpp ;; +- *.cxx) xform=cxx ;; +- *.f90) xform=f90 ;; +- *.for) xform=for ;; +- *.java) xform=java ;; ++ $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 ++} ++ ++# func_ltwrapper_scriptname file ++# Assumes file is an ltwrapper_executable ++# uses $file to determine the appropriate filename for a ++# temporary ltwrapper_script. ++func_ltwrapper_scriptname () ++{ ++ func_ltwrapper_scriptname_result="" ++ if func_ltwrapper_executable_p "$1"; then ++ func_dirname_and_basename "$1" "" "." ++ func_stripname '' '.exe' "$func_basename_result" ++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" ++ fi ++} ++ ++# func_ltwrapper_p file ++# True iff FILE is a libtool wrapper script or wrapper executable ++# This function is only a basic sanity check; it will hardly flush out ++# determined imposters. ++func_ltwrapper_p () ++{ ++ func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" ++} ++ ++ ++# func_execute_cmds commands fail_cmd ++# Execute tilde-delimited COMMANDS. ++# If FAIL_CMD is given, eval that upon failure. ++# FAIL_CMD may read-access the current command in variable CMD! ++func_execute_cmds () ++{ ++ $opt_debug ++ save_ifs=$IFS; IFS='~' ++ for cmd in $1; do ++ IFS=$save_ifs ++ eval cmd=\"$cmd\" ++ func_show_eval "$cmd" "${2-:}" ++ done ++ IFS=$save_ifs ++} ++ ++ ++# func_source file ++# Source FILE, adding directory component if necessary. ++# Note that it is not necessary on cygwin/mingw to append a dot to ++# FILE even if both FILE and FILE.exe exist: automatic-append-.exe ++# behavior happens only for exec(3), not for open(2)! Also, sourcing ++# `FILE.' does not work on cygwin managed mounts. ++func_source () ++{ ++ $opt_debug ++ case $1 in ++ */* | *\\*) . "$1" ;; ++ *) . "./$1" ;; + esac +- +- libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` +- +- case $libobj in +- *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; +- *) +- $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 +- exit 1 +- ;; +- esac +- +- # Infer tagged configuration to use if any are available and +- # if one wasn't chosen via the "--tag" command line option. +- # Only attempt this if the compiler in the base compile +- # command doesn't match the default compiler. ++} ++ ++ ++# func_infer_tag arg ++# Infer tagged configuration to use if any are available and ++# if one wasn't chosen via the "--tag" command line option. ++# Only attempt this if the compiler in the base compile ++# command doesn't match the default compiler. ++# arg is usually of the form 'gcc ...' ++func_infer_tag () ++{ ++ $opt_debug + if test -n "$available_tags" && test -z "$tagname"; then +- case $base_compile in ++ CC_quoted= ++ for arg in $CC; do ++ func_quote_for_eval "$arg" ++ CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ done ++ case $@ in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. +- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;; ++ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + for z in $available_tags; do +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then ++ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then + # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" +- case "$base_compile " in +- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" ++ CC_quoted= ++ for arg in $CC; do ++ # Double-quote args containing other shell metacharacters. ++ func_quote_for_eval "$arg" ++ CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ done ++ case "$@ " in ++ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) + # The compiler in the base compile command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. +@@ -548,19 +1048,197 @@ + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then +- $echo "$modename: unable to infer tagged configuration" +- $echo "$modename: specify a tag with \`--tag'" 1>&2 +- exit 1 +-# else +-# $echo "$modename: using $tagname tagged configuration" ++ func_echo "unable to infer tagged configuration" ++ func_fatal_error "specify a tag with \`--tag'" ++# else ++# func_verbose "using $tagname tagged configuration" + fi + ;; + esac + fi ++} ++ ++ ++ ++# func_write_libtool_object output_name pic_name nonpic_name ++# Create a libtool object file (analogous to a ".la" file), ++# but don't create it if we're doing a dry run. ++func_write_libtool_object () ++{ ++ write_libobj=${1} ++ if test "$build_libtool_libs" = yes; then ++ write_lobj=\'${2}\' ++ else ++ write_lobj=none ++ fi ++ ++ if test "$build_old_libs" = yes; then ++ write_oldobj=\'${3}\' ++ else ++ write_oldobj=none ++ fi ++ ++ $opt_dry_run || { ++ cat >${write_libobj}T <?"'"'"' &()|`$[]' \ ++ && func_warning "libobj name \`$libobj' may not contain shell special characters." ++ func_dirname_and_basename "$obj" "/" "" ++ objname="$func_basename_result" ++ xdir="$func_dirname_result" + lobj=${xdir}$objdir/$objname + +- if test -z "$base_compile"; then +- $echo "$modename: you must specify a compilation command" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- fi ++ test -z "$base_compile" && \ ++ func_fatal_help "you must specify a compilation command" + + # Delete any leftover library objects. + if test "$build_old_libs" = yes; then +@@ -599,12 +1274,9 @@ + removelist="$lobj $libobj ${libobj}T" + fi + +- $run $rm $removelist +- trap "$run $rm $removelist; exit 1" 1 2 15 +- + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in +- cygwin* | mingw* | pw32* | os2*) ++ cygwin* | mingw* | pw32* | os2* | cegcc*) + pic_mode=default + ;; + esac +@@ -616,10 +1288,8 @@ + # Calculate the filename of the output object if compiler does + # not support -o with -c + if test "$compiler_c_o" = no; then +- output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} ++ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + lockfile="$output_obj.lock" +- removelist="$removelist $output_obj $lockfile" +- trap "$run $rm $removelist; exit 1" 1 2 15 + else + output_obj= + need_locks=no +@@ -629,13 +1299,13 @@ + # Lock this critical section if it is needed + # We use this script file to make the link, it avoids creating a new file + if test "$need_locks" = yes; then +- until $run ln "$0" "$lockfile" 2>/dev/null; do +- $show "Waiting for $lockfile to be removed" ++ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do ++ func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + elif test "$need_locks" = warn; then + if test -f "$lockfile"; then +- $echo "\ ++ $ECHO "\ + *** ERROR, $lockfile exists and contains: + `cat $lockfile 2>/dev/null` + +@@ -646,29 +1316,22 @@ + avoid parallel builds (make -j) in this platform, or get a better + compiler." + +- $run $rm $removelist +- exit 1 ++ $opt_dry_run || $RM $removelist ++ exit $EXIT_FAILURE + fi +- $echo $srcfile > "$lockfile" ++ removelist="$removelist $output_obj" ++ $ECHO "$srcfile" > "$lockfile" + fi + ++ $opt_dry_run || $RM $removelist ++ removelist="$removelist $lockfile" ++ trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 ++ + if test -n "$fix_srcfile_path"; then + eval srcfile=\"$fix_srcfile_path\" + fi +- +- $run $rm "$libobj" "${libobj}T" +- +- # Create a libtool object file (analogous to a ".la" file), +- # but don't create it if we're doing a dry run. +- test -z "$run" && cat > ${libobj}T </dev/null`" != "X$srcfile"; then +- $echo "\ ++ $ECHO "\ + *** ERROR, $lockfile contains: + `cat $lockfile 2>/dev/null` + +@@ -721,47 +1371,29 @@ + avoid parallel builds (make -j) in this platform, or get a better + compiler." + +- $run $rm $removelist +- exit 1 ++ $opt_dry_run || $RM $removelist ++ exit $EXIT_FAILURE + fi + + # Just move the object if needed, then go on to compile the next one + if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then +- $show "$mv $output_obj $lobj" +- if $run $mv $output_obj $lobj; then : +- else +- error=$? +- $run $rm $removelist +- exit $error +- fi ++ func_show_eval '$MV "$output_obj" "$lobj"' \ ++ 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi + +- # Append the name of the PIC object to the libtool object file. +- test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null`" != "X$srcfile"; then +- $echo "\ ++ $ECHO "\ + *** ERROR, $lockfile contains: + `cat $lockfile 2>/dev/null` + +@@ -793,53 +1420,2620 @@ + avoid parallel builds (make -j) in this platform, or get a better + compiler." + +- $run $rm $removelist ++ $opt_dry_run || $RM $removelist ++ exit $EXIT_FAILURE ++ fi ++ ++ # Just move the object if needed ++ if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then ++ func_show_eval '$MV "$output_obj" "$obj"' \ ++ 'error=$?; $opt_dry_run || $RM $removelist; exit $error' ++ fi ++ fi ++ ++ $opt_dry_run || { ++ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" ++ ++ # Unlock the critical section if it was locked ++ if test "$need_locks" != no; then ++ removelist=$lockfile ++ $RM "$lockfile" ++ fi ++ } ++ ++ exit $EXIT_SUCCESS ++} ++ ++$opt_help || { ++test "$mode" = compile && func_mode_compile ${1+"$@"} ++} ++ ++func_mode_help () ++{ ++ # We need to display help for each of the modes. ++ case $mode in ++ "") ++ # Generic help is extracted from the usage comments ++ # at the start of this file. ++ func_help ++ ;; ++ ++ clean) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... ++ ++Remove files from the build directory. ++ ++RM is the name of the program to use to delete files associated with each FILE ++(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed ++to RM. ++ ++If FILE is a libtool library, object or program, all the files associated ++with it are deleted. Otherwise, only FILE itself is deleted using RM." ++ ;; ++ ++ compile) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE ++ ++Compile a source file into a libtool library object. ++ ++This mode accepts the following additional options: ++ ++ -o OUTPUT-FILE set the output file name to OUTPUT-FILE ++ -no-suppress do not suppress compiler output for multiple passes ++ -prefer-pic try to building PIC objects only ++ -prefer-non-pic try to building non-PIC objects only ++ -shared do not build a \`.o' file suitable for static linking ++ -static only build a \`.o' file suitable for static linking ++ ++COMPILE-COMMAND is a command to be used in creating a \`standard' object file ++from the given SOURCEFILE. ++ ++The output file name is determined by removing the directory component from ++SOURCEFILE, then substituting the C source code suffix \`.c' with the ++library object suffix, \`.lo'." ++ ;; ++ ++ execute) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... ++ ++Automatically set library path, then run a program. ++ ++This mode accepts the following additional options: ++ ++ -dlopen FILE add the directory containing FILE to the library path ++ ++This mode sets the library path environment variable according to \`-dlopen' ++flags. ++ ++If any of the ARGS are libtool executable wrappers, then they are translated ++into their corresponding uninstalled binary, and any of their required library ++directories are added to the library path. ++ ++Then, COMMAND is executed, with ARGS as arguments." ++ ;; ++ ++ finish) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... ++ ++Complete the installation of libtool libraries. ++ ++Each LIBDIR is a directory that contains libtool libraries. ++ ++The commands that this mode executes may require superuser privileges. Use ++the \`--dry-run' option if you just want to see what would be executed." ++ ;; ++ ++ install) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... ++ ++Install executables or libraries. ++ ++INSTALL-COMMAND is the installation command. The first component should be ++either the \`install' or \`cp' program. ++ ++The following components of INSTALL-COMMAND are treated specially: ++ ++ -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation ++ ++The rest of the components are interpreted as arguments to that command (only ++BSD-compatible install options are recognized)." ++ ;; ++ ++ link) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... ++ ++Link object files or libraries together to form another library, or to ++create an executable program. ++ ++LINK-COMMAND is a command using the C compiler that you would use to create ++a program from several object files. ++ ++The following components of LINK-COMMAND are treated specially: ++ ++ -all-static do not do any dynamic linking at all ++ -avoid-version do not add a version suffix if possible ++ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime ++ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols ++ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) ++ -export-symbols SYMFILE ++ try to export only the symbols listed in SYMFILE ++ -export-symbols-regex REGEX ++ try to export only the symbols matching REGEX ++ -LLIBDIR search LIBDIR for required installed libraries ++ -lNAME OUTPUT-FILE requires the installed library libNAME ++ -module build a library that can dlopened ++ -no-fast-install disable the fast-install mode ++ -no-install link a not-installable executable ++ -no-undefined declare that a library does not refer to external symbols ++ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects ++ -objectlist FILE Use a list of object files found in FILE to specify objects ++ -precious-files-regex REGEX ++ don't remove output files matching REGEX ++ -release RELEASE specify package release information ++ -rpath LIBDIR the created library will eventually be installed in LIBDIR ++ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries ++ -shared only do dynamic linking of libtool libraries ++ -shrext SUFFIX override the standard shared library file extension ++ -static do not do any dynamic linking of uninstalled libtool libraries ++ -static-libtool-libs ++ do not do any dynamic linking of libtool libraries ++ -version-info CURRENT[:REVISION[:AGE]] ++ specify library version info [each variable defaults to 0] ++ -weak LIBNAME declare that the target provides the LIBNAME interface ++ ++All other options (arguments beginning with \`-') are ignored. ++ ++Every other argument is treated as a filename. Files ending in \`.la' are ++treated as uninstalled libtool libraries, other files are standard or library ++object files. ++ ++If the OUTPUT-FILE ends in \`.la', then a libtool library is created, ++only library objects (\`.lo' files) may be specified, and \`-rpath' is ++required, except when creating a convenience library. ++ ++If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created ++using \`ar' and \`ranlib', or on Windows using \`lib'. ++ ++If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file ++is created, otherwise an executable program is created." ++ ;; ++ ++ uninstall) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... ++ ++Remove libraries from an installation directory. ++ ++RM is the name of the program to use to delete files associated with each FILE ++(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed ++to RM. ++ ++If FILE is a libtool library, all the files associated with it are deleted. ++Otherwise, only FILE itself is deleted using RM." ++ ;; ++ ++ *) ++ func_fatal_help "invalid operation mode \`$mode'" ++ ;; ++ esac ++ ++ $ECHO ++ $ECHO "Try \`$progname --help' for more information about other modes." ++ ++ exit $? ++} ++ ++ # Now that we've collected a possible --mode arg, show help if necessary ++ $opt_help && func_mode_help ++ ++ ++# func_mode_execute arg... ++func_mode_execute () ++{ ++ $opt_debug ++ # The first argument is the command name. ++ cmd="$nonopt" ++ test -z "$cmd" && \ ++ func_fatal_help "you must specify a COMMAND" ++ ++ # Handle -dlopen flags immediately. ++ for file in $execute_dlfiles; do ++ test -f "$file" \ ++ || func_fatal_help "\`$file' is not a file" ++ ++ dir= ++ case $file in ++ *.la) ++ # Check to see that this really is a libtool archive. ++ func_lalib_unsafe_p "$file" \ ++ || func_fatal_help "\`$lib' is not a valid libtool archive" ++ ++ # Read the libtool library. ++ dlname= ++ library_names= ++ func_source "$file" ++ ++ # Skip this library if it cannot be dlopened. ++ if test -z "$dlname"; then ++ # Warn if it was a shared library. ++ test -n "$library_names" && \ ++ func_warning "\`$file' was not linked with \`-export-dynamic'" ++ continue ++ fi ++ ++ func_dirname "$file" "" "." ++ dir="$func_dirname_result" ++ ++ if test -f "$dir/$objdir/$dlname"; then ++ dir="$dir/$objdir" ++ else ++ if test ! -f "$dir/$dlname"; then ++ func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" ++ fi ++ fi ++ ;; ++ ++ *.lo) ++ # Just add the directory containing the .lo file. ++ func_dirname "$file" "" "." ++ dir="$func_dirname_result" ++ ;; ++ ++ *) ++ func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" ++ continue ++ ;; ++ esac ++ ++ # Get the absolute pathname. ++ absdir=`cd "$dir" && pwd` ++ test -n "$absdir" && dir="$absdir" ++ ++ # Now add the directory to shlibpath_var. ++ if eval "test -z \"\$$shlibpath_var\""; then ++ eval "$shlibpath_var=\"\$dir\"" ++ else ++ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" ++ fi ++ done ++ ++ # This variable tells wrapper scripts just to set shlibpath_var ++ # rather than running their programs. ++ libtool_execute_magic="$magic" ++ ++ # Check if any of the arguments is a wrapper script. ++ args= ++ for file ++ do ++ case $file in ++ -*) ;; ++ *) ++ # Do a test to see if this is really a libtool program. ++ if func_ltwrapper_script_p "$file"; then ++ func_source "$file" ++ # Transform arg to wrapped name. ++ file="$progdir/$program" ++ elif func_ltwrapper_executable_p "$file"; then ++ func_ltwrapper_scriptname "$file" ++ func_source "$func_ltwrapper_scriptname_result" ++ # Transform arg to wrapped name. ++ file="$progdir/$program" ++ fi ++ ;; ++ esac ++ # Quote arguments (to preserve shell metacharacters). ++ func_quote_for_eval "$file" ++ args="$args $func_quote_for_eval_result" ++ done ++ ++ if test "X$opt_dry_run" = Xfalse; then ++ if test -n "$shlibpath_var"; then ++ # Export the shlibpath_var. ++ eval "export $shlibpath_var" ++ fi ++ ++ # Restore saved environment variables ++ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++ do ++ eval "if test \"\${save_$lt_var+set}\" = set; then ++ $lt_var=\$save_$lt_var; export $lt_var ++ else ++ $lt_unset $lt_var ++ fi" ++ done ++ ++ # Now prepare to actually exec the command. ++ exec_cmd="\$cmd$args" ++ else ++ # Display what would be done. ++ if test -n "$shlibpath_var"; then ++ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" ++ $ECHO "export $shlibpath_var" ++ fi ++ $ECHO "$cmd$args" ++ exit $EXIT_SUCCESS ++ fi ++} ++ ++test "$mode" = execute && func_mode_execute ${1+"$@"} ++ ++ ++# func_mode_finish arg... ++func_mode_finish () ++{ ++ $opt_debug ++ libdirs="$nonopt" ++ admincmds= ++ ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then ++ for dir ++ do ++ libdirs="$libdirs $dir" ++ done ++ ++ for libdir in $libdirs; do ++ if test -n "$finish_cmds"; then ++ # Do each command in the finish commands. ++ func_execute_cmds "$finish_cmds" 'admincmds="$admincmds ++'"$cmd"'"' ++ fi ++ if test -n "$finish_eval"; then ++ # Do the single finish_eval. ++ eval cmds=\"$finish_eval\" ++ $opt_dry_run || eval "$cmds" || admincmds="$admincmds ++ $cmds" ++ fi ++ done ++ fi ++ ++ # Exit here if they wanted silent mode. ++ $opt_silent && exit $EXIT_SUCCESS ++ ++ $ECHO "X----------------------------------------------------------------------" | $Xsed ++ $ECHO "Libraries have been installed in:" ++ for libdir in $libdirs; do ++ $ECHO " $libdir" ++ done ++ $ECHO ++ $ECHO "If you ever happen to want to link against installed libraries" ++ $ECHO "in a given directory, LIBDIR, you must either use libtool, and" ++ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" ++ $ECHO "flag during linking and do at least one of the following:" ++ if test -n "$shlibpath_var"; then ++ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" ++ $ECHO " during execution" ++ fi ++ if test -n "$runpath_var"; then ++ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" ++ $ECHO " during linking" ++ fi ++ if test -n "$hardcode_libdir_flag_spec"; then ++ libdir=LIBDIR ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ ++ $ECHO " - use the \`$flag' linker flag" ++ fi ++ if test -n "$admincmds"; then ++ $ECHO " - have your system administrator run these commands:$admincmds" ++ fi ++ if test -f /etc/ld.so.conf; then ++ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" ++ fi ++ $ECHO ++ ++ $ECHO "See any operating system documentation about shared libraries for" ++ case $host in ++ solaris2.[6789]|solaris2.1[0-9]) ++ $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" ++ $ECHO "pages." ++ ;; ++ *) ++ $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." ++ ;; ++ esac ++ $ECHO "X----------------------------------------------------------------------" | $Xsed ++ exit $EXIT_SUCCESS ++} ++ ++test "$mode" = finish && func_mode_finish ${1+"$@"} ++ ++ ++# func_mode_install arg... ++func_mode_install () ++{ ++ $opt_debug ++ # There may be an optional sh(1) argument at the beginning of ++ # install_prog (especially on Windows NT). ++ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || ++ # Allow the use of GNU shtool's install command. ++ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then ++ # Aesthetically quote it. ++ func_quote_for_eval "$nonopt" ++ install_prog="$func_quote_for_eval_result " ++ arg=$1 ++ shift ++ else ++ install_prog= ++ arg=$nonopt ++ fi ++ ++ # The real first argument should be the name of the installation program. ++ # Aesthetically quote it. ++ func_quote_for_eval "$arg" ++ install_prog="$install_prog$func_quote_for_eval_result" ++ ++ # We need to accept at least all the BSD install flags. ++ dest= ++ files= ++ opts= ++ prev= ++ install_type= ++ isdir=no ++ stripme= ++ for arg ++ do ++ if test -n "$dest"; then ++ files="$files $dest" ++ dest=$arg ++ continue ++ fi ++ ++ case $arg in ++ -d) isdir=yes ;; ++ -f) ++ case " $install_prog " in ++ *[\\\ /]cp\ *) ;; ++ *) prev=$arg ;; ++ esac ++ ;; ++ -g | -m | -o) ++ prev=$arg ++ ;; ++ -s) ++ stripme=" -s" ++ continue ++ ;; ++ -*) ++ ;; ++ *) ++ # If the previous option needed an argument, then skip it. ++ if test -n "$prev"; then ++ prev= ++ else ++ dest=$arg ++ continue ++ fi ++ ;; ++ esac ++ ++ # Aesthetically quote the argument. ++ func_quote_for_eval "$arg" ++ install_prog="$install_prog $func_quote_for_eval_result" ++ done ++ ++ test -z "$install_prog" && \ ++ func_fatal_help "you must specify an install program" ++ ++ test -n "$prev" && \ ++ func_fatal_help "the \`$prev' option requires an argument" ++ ++ if test -z "$files"; then ++ if test -z "$dest"; then ++ func_fatal_help "no file or destination specified" ++ else ++ func_fatal_help "you must specify a destination" ++ fi ++ fi ++ ++ # Strip any trailing slash from the destination. ++ func_stripname '' '/' "$dest" ++ dest=$func_stripname_result ++ ++ # Check to see that the destination is a directory. ++ test -d "$dest" && isdir=yes ++ if test "$isdir" = yes; then ++ destdir="$dest" ++ destname= ++ else ++ func_dirname_and_basename "$dest" "" "." ++ destdir="$func_dirname_result" ++ destname="$func_basename_result" ++ ++ # Not a directory, so check to see that there is only one file specified. ++ set dummy $files; shift ++ test "$#" -gt 1 && \ ++ func_fatal_help "\`$dest' is not a directory" ++ fi ++ case $destdir in ++ [\\/]* | [A-Za-z]:[\\/]*) ;; ++ *) ++ for file in $files; do ++ case $file in ++ *.lo) ;; ++ *) ++ func_fatal_help "\`$destdir' must be an absolute directory name" ++ ;; ++ esac ++ done ++ ;; ++ esac ++ ++ # This variable tells wrapper scripts just to set variables rather ++ # than running their programs. ++ libtool_install_magic="$magic" ++ ++ staticlibs= ++ future_libdirs= ++ current_libdirs= ++ for file in $files; do ++ ++ # Do each installation. ++ case $file in ++ *.$libext) ++ # Do the static libraries later. ++ staticlibs="$staticlibs $file" ++ ;; ++ ++ *.la) ++ # Check to see that this really is a libtool archive. ++ func_lalib_unsafe_p "$file" \ ++ || func_fatal_help "\`$file' is not a valid libtool archive" ++ ++ library_names= ++ old_library= ++ relink_command= ++ func_source "$file" ++ ++ # Add the libdir to current_libdirs if it is the destination. ++ if test "X$destdir" = "X$libdir"; then ++ case "$current_libdirs " in ++ *" $libdir "*) ;; ++ *) current_libdirs="$current_libdirs $libdir" ;; ++ esac ++ else ++ # Note the libdir as a future libdir. ++ case "$future_libdirs " in ++ *" $libdir "*) ;; ++ *) future_libdirs="$future_libdirs $libdir" ;; ++ esac ++ fi ++ ++ func_dirname "$file" "/" "" ++ dir="$func_dirname_result" ++ dir="$dir$objdir" ++ ++ if test -n "$relink_command"; then ++ # Determine the prefix the user has applied to our future dir. ++ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` ++ ++ # Don't allow the user to place us outside of our expected ++ # location b/c this prevents finding dependent libraries that ++ # are installed to the same prefix. ++ # At present, this check doesn't affect windows .dll's that ++ # are installed into $libdir/../bin (currently, that works fine) ++ # but it's something to keep an eye on. ++ test "$inst_prefix_dir" = "$destdir" && \ ++ func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" ++ ++ if test -n "$inst_prefix_dir"; then ++ # Stick the inst_prefix_dir data into the link command. ++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` ++ else ++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` ++ fi ++ ++ func_warning "relinking \`$file'" ++ func_show_eval "$relink_command" \ ++ 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' ++ fi ++ ++ # See the names of the shared library. ++ set dummy $library_names; shift ++ if test -n "$1"; then ++ realname="$1" ++ shift ++ ++ srcname="$realname" ++ test -n "$relink_command" && srcname="$realname"T ++ ++ # Install the shared library and build the symlinks. ++ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ ++ 'exit $?' ++ tstripme="$stripme" ++ case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ case $realname in ++ *.dll.a) ++ tstripme="" ++ ;; ++ esac ++ ;; ++ esac ++ if test -n "$tstripme" && test -n "$striplib"; then ++ func_show_eval "$striplib $destdir/$realname" 'exit $?' ++ fi ++ ++ if test "$#" -gt 0; then ++ # Delete the old symlinks, and create new ones. ++ # Try `ln -sf' first, because the `ln' binary might depend on ++ # the symlink we replace! Solaris /bin/ln does not understand -f, ++ # so we also need to try rm && ln -s. ++ for linkname ++ do ++ test "$linkname" != "$realname" \ ++ && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" ++ done ++ fi ++ ++ # Do each command in the postinstall commands. ++ lib="$destdir/$realname" ++ func_execute_cmds "$postinstall_cmds" 'exit $?' ++ fi ++ ++ # Install the pseudo-library for information purposes. ++ func_basename "$file" ++ name="$func_basename_result" ++ instname="$dir/$name"i ++ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' ++ ++ # Maybe install the static library, too. ++ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ++ ;; ++ ++ *.lo) ++ # Install (i.e. copy) a libtool object. ++ ++ # Figure out destination file name, if it wasn't already specified. ++ if test -n "$destname"; then ++ destfile="$destdir/$destname" ++ else ++ func_basename "$file" ++ destfile="$func_basename_result" ++ destfile="$destdir/$destfile" ++ fi ++ ++ # Deduce the name of the destination old-style object file. ++ case $destfile in ++ *.lo) ++ func_lo2o "$destfile" ++ staticdest=$func_lo2o_result ++ ;; ++ *.$objext) ++ staticdest="$destfile" ++ destfile= ++ ;; ++ *) ++ func_fatal_help "cannot copy a libtool object to \`$destfile'" ++ ;; ++ esac ++ ++ # Install the libtool object if requested. ++ test -n "$destfile" && \ ++ func_show_eval "$install_prog $file $destfile" 'exit $?' ++ ++ # Install the old object if enabled. ++ if test "$build_old_libs" = yes; then ++ # Deduce the name of the old-style object file. ++ func_lo2o "$file" ++ staticobj=$func_lo2o_result ++ func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' ++ fi ++ exit $EXIT_SUCCESS ++ ;; ++ ++ *) ++ # Figure out destination file name, if it wasn't already specified. ++ if test -n "$destname"; then ++ destfile="$destdir/$destname" ++ else ++ func_basename "$file" ++ destfile="$func_basename_result" ++ destfile="$destdir/$destfile" ++ fi ++ ++ # If the file is missing, and there is a .exe on the end, strip it ++ # because it is most likely a libtool script we actually want to ++ # install ++ stripped_ext="" ++ case $file in ++ *.exe) ++ if test ! -f "$file"; then ++ func_stripname '' '.exe' "$file" ++ file=$func_stripname_result ++ stripped_ext=".exe" ++ fi ++ ;; ++ esac ++ ++ # Do a test to see if this is really a libtool program. ++ case $host in ++ *cygwin* | *mingw*) ++ if func_ltwrapper_executable_p "$file"; then ++ func_ltwrapper_scriptname "$file" ++ wrapper=$func_ltwrapper_scriptname_result ++ else ++ func_stripname '' '.exe' "$file" ++ wrapper=$func_stripname_result ++ fi ++ ;; ++ *) ++ wrapper=$file ++ ;; ++ esac ++ if func_ltwrapper_script_p "$wrapper"; then ++ notinst_deplibs= ++ relink_command= ++ ++ func_source "$wrapper" ++ ++ # Check the variables that should have been set. ++ test -z "$generated_by_libtool_version" && \ ++ func_fatal_error "invalid libtool wrapper script \`$wrapper'" ++ ++ finalize=yes ++ for lib in $notinst_deplibs; do ++ # Check to see that each library is installed. ++ libdir= ++ if test -f "$lib"; then ++ func_source "$lib" ++ fi ++ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test ++ if test -n "$libdir" && test ! -f "$libfile"; then ++ func_warning "\`$lib' has not been installed in \`$libdir'" ++ finalize=no ++ fi ++ done ++ ++ relink_command= ++ func_source "$wrapper" ++ ++ outputname= ++ if test "$fast_install" = no && test -n "$relink_command"; then ++ $opt_dry_run || { ++ if test "$finalize" = yes; then ++ tmpdir=`func_mktempdir` ++ func_basename "$file$stripped_ext" ++ file="$func_basename_result" ++ outputname="$tmpdir/$file" ++ # Replace the output file specification. ++ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` ++ ++ $opt_silent || { ++ func_quote_for_expand "$relink_command" ++ eval "func_echo $func_quote_for_expand_result" ++ } ++ if eval "$relink_command"; then : ++ else ++ func_error "error: relink \`$file' with the above command before installing it" ++ $opt_dry_run || ${RM}r "$tmpdir" ++ continue ++ fi ++ file="$outputname" ++ else ++ func_warning "cannot relink \`$file'" ++ fi ++ } ++ else ++ # Install the binary that we compiled earlier. ++ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` ++ fi ++ fi ++ ++ # remove .exe since cygwin /usr/bin/install will append another ++ # one anyway ++ case $install_prog,$host in ++ */usr/bin/install*,*cygwin*) ++ case $file:$destfile in ++ *.exe:*.exe) ++ # this is ok ++ ;; ++ *.exe:*) ++ destfile=$destfile.exe ++ ;; ++ *:*.exe) ++ func_stripname '' '.exe' "$destfile" ++ destfile=$func_stripname_result ++ ;; ++ esac ++ ;; ++ esac ++ func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' ++ $opt_dry_run || if test -n "$outputname"; then ++ ${RM}r "$tmpdir" ++ fi ++ ;; ++ esac ++ done ++ ++ for file in $staticlibs; do ++ func_basename "$file" ++ name="$func_basename_result" ++ ++ # Set up the ranlib parameters. ++ oldlib="$destdir/$name" ++ ++ func_show_eval "$install_prog \$file \$oldlib" 'exit $?' ++ ++ if test -n "$stripme" && test -n "$old_striplib"; then ++ func_show_eval "$old_striplib $oldlib" 'exit $?' ++ fi ++ ++ # Do each command in the postinstall commands. ++ func_execute_cmds "$old_postinstall_cmds" 'exit $?' ++ done ++ ++ test -n "$future_libdirs" && \ ++ func_warning "remember to run \`$progname --finish$future_libdirs'" ++ ++ if test -n "$current_libdirs"; then ++ # Maybe just do a dry run. ++ $opt_dry_run && current_libdirs=" -n$current_libdirs" ++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' ++ else ++ exit $EXIT_SUCCESS ++ fi ++} ++ ++test "$mode" = install && func_mode_install ${1+"$@"} ++ ++ ++# func_generate_dlsyms outputname originator pic_p ++# Extract symbols from dlprefiles and create ${outputname}S.o with ++# a dlpreopen symbol table. ++func_generate_dlsyms () ++{ ++ $opt_debug ++ my_outputname="$1" ++ my_originator="$2" ++ my_pic_p="${3-no}" ++ my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` ++ my_dlsyms= ++ ++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then ++ if test -n "$NM" && test -n "$global_symbol_pipe"; then ++ my_dlsyms="${my_outputname}S.c" ++ else ++ func_error "not configured to extract global symbols from dlpreopened files" ++ fi ++ fi ++ ++ if test -n "$my_dlsyms"; then ++ case $my_dlsyms in ++ "") ;; ++ *.c) ++ # Discover the nlist of each of the dlfiles. ++ nlist="$output_objdir/${my_outputname}.nm" ++ ++ func_show_eval "$RM $nlist ${nlist}S ${nlist}T" ++ ++ # Parse the name list into a source file. ++ func_verbose "creating $output_objdir/$my_dlsyms" ++ ++ $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ ++/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ ++/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ ++ ++#ifdef __cplusplus ++extern \"C\" { ++#endif ++ ++/* External symbol declarations for the compiler. */\ ++" ++ ++ if test "$dlself" = yes; then ++ func_verbose "generating symbol list for \`$output'" ++ ++ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" ++ ++ # Add our own program objects to the symbol list. ++ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ for progfile in $progfiles; do ++ func_verbose "extracting global C symbols from \`$progfile'" ++ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" ++ done ++ ++ if test -n "$exclude_expsyms"; then ++ $opt_dry_run || { ++ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' ++ } ++ fi ++ ++ if test -n "$export_symbols_regex"; then ++ $opt_dry_run || { ++ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' ++ } ++ fi ++ ++ # Prepare the list of exported symbols ++ if test -z "$export_symbols"; then ++ export_symbols="$output_objdir/$outputname.exp" ++ $opt_dry_run || { ++ $RM $export_symbols ++ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ++ ;; ++ esac ++ } ++ else ++ $opt_dry_run || { ++ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' ++ case $host in ++ *cygwin | *mingw* | *cegcc* ) ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ++ ;; ++ esac ++ } ++ fi ++ fi ++ ++ for dlprefile in $dlprefiles; do ++ func_verbose "extracting global C symbols from \`$dlprefile'" ++ func_basename "$dlprefile" ++ name="$func_basename_result" ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ done ++ ++ $opt_dry_run || { ++ # Make sure we have at least an empty file. ++ test -f "$nlist" || : > "$nlist" ++ ++ if test -n "$exclude_expsyms"; then ++ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T ++ $MV "$nlist"T "$nlist" ++ fi ++ ++ # Try sorting and uniquifying the output. ++ if $GREP -v "^: " < "$nlist" | ++ if sort -k 3 /dev/null 2>&1; then ++ sort -k 3 ++ else ++ sort +2 ++ fi | ++ uniq > "$nlist"S; then ++ : ++ else ++ $GREP -v "^: " < "$nlist" > "$nlist"S ++ fi ++ ++ if test -f "$nlist"S; then ++ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' ++ else ++ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" ++ fi ++ ++ $ECHO >> "$output_objdir/$my_dlsyms" "\ ++ ++/* The mapping between symbol names and symbols. */ ++typedef struct { ++ const char *name; ++ void *address; ++} lt_dlsymlist; ++" ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ $ECHO >> "$output_objdir/$my_dlsyms" "\ ++/* DATA imports from DLLs on WIN32 con't be const, because ++ runtime relocations are performed -- see ld's documentation ++ on pseudo-relocs. */" ++ lt_dlsym_const= ;; ++ *osf5*) ++ echo >> "$output_objdir/$my_dlsyms" "\ ++/* This system does not cope well with relocations in const data */" ++ lt_dlsym_const= ;; ++ *) ++ lt_dlsym_const=const ;; ++ esac ++ ++ $ECHO >> "$output_objdir/$my_dlsyms" "\ ++extern $lt_dlsym_const lt_dlsymlist ++lt_${my_prefix}_LTX_preloaded_symbols[]; ++$lt_dlsym_const lt_dlsymlist ++lt_${my_prefix}_LTX_preloaded_symbols[] = ++{\ ++ { \"$my_originator\", (void *) 0 }," ++ ++ case $need_lib_prefix in ++ no) ++ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" ++ ;; ++ *) ++ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ++ ;; ++ esac ++ $ECHO >> "$output_objdir/$my_dlsyms" "\ ++ {0, (void *) 0} ++}; ++ ++/* This works around a problem in FreeBSD linker */ ++#ifdef FREEBSD_WORKAROUND ++static const void *lt_preloaded_setup() { ++ return lt_${my_prefix}_LTX_preloaded_symbols; ++} ++#endif ++ ++#ifdef __cplusplus ++} ++#endif\ ++" ++ } # !$opt_dry_run ++ ++ pic_flag_for_symtable= ++ case "$compile_command " in ++ *" -static "*) ;; ++ *) ++ case $host in ++ # compiling the symbol table file with pic_flag works around ++ # a FreeBSD bug that causes programs to crash when -lm is ++ # linked before any other PIC object. But we must not use ++ # pic_flag when linking with -static. The problem exists in ++ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. ++ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) ++ pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; ++ *-*-hpux*) ++ pic_flag_for_symtable=" $pic_flag" ;; ++ *) ++ if test "X$my_pic_p" != Xno; then ++ pic_flag_for_symtable=" $pic_flag" ++ fi ++ ;; ++ esac ++ ;; ++ esac ++ symtab_cflags= ++ for arg in $LTCFLAGS; do ++ case $arg in ++ -pie | -fpie | -fPIE) ;; ++ *) symtab_cflags="$symtab_cflags $arg" ;; ++ esac ++ done ++ ++ # Now compile the dynamic symbol file. ++ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' ++ ++ # Clean up the generated files. ++ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' ++ ++ # Transform the symbol file into the correct name. ++ symfileobj="$output_objdir/${my_outputname}S.$objext" ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ if test -f "$output_objdir/$my_outputname.def"; then ++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` ++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` ++ else ++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ++ fi ++ ;; ++ *) ++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ++ ;; ++ esac ++ ;; ++ *) ++ func_fatal_error "unknown suffix for \`$my_dlsyms'" ++ ;; ++ esac ++ else ++ # We keep going just in case the user didn't refer to ++ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe ++ # really was required. ++ ++ # Nullify the symbol file. ++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` ++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` ++ fi ++} ++ ++# func_win32_libid arg ++# return the library type of file 'arg' ++# ++# Need a lot of goo to handle *both* DLLs and import libs ++# Has to be a shell function in order to 'eat' the argument ++# that is supplied when $file_magic_command is called. ++func_win32_libid () ++{ ++ $opt_debug ++ win32_libid_type="unknown" ++ win32_fileres=`file -L $1 2>/dev/null` ++ case $win32_fileres in ++ *ar\ archive\ import\ library*) # definitely import ++ win32_libid_type="x86 archive import" ++ ;; ++ *ar\ archive*) # could be an import, or static ++ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | ++ $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then ++ win32_nmres=`eval $NM -f posix -A $1 | ++ $SED -n -e ' ++ 1,100{ ++ / I /{ ++ s,.*,import, ++ p ++ q ++ } ++ }'` ++ case $win32_nmres in ++ import*) win32_libid_type="x86 archive import";; ++ *) win32_libid_type="x86 archive static";; ++ esac ++ fi ++ ;; ++ *DLL*) ++ win32_libid_type="x86 DLL" ++ ;; ++ *executable*) # but shell scripts are "executable" too... ++ case $win32_fileres in ++ *MS\ Windows\ PE\ Intel*) ++ win32_libid_type="x86 DLL" ++ ;; ++ esac ++ ;; ++ esac ++ $ECHO "$win32_libid_type" ++} ++ ++ ++ ++# func_extract_an_archive dir oldlib ++func_extract_an_archive () ++{ ++ $opt_debug ++ f_ex_an_ar_dir="$1"; shift ++ f_ex_an_ar_oldlib="$1" ++ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' ++ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then ++ : ++ else ++ func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" ++ fi ++} ++ ++ ++# func_extract_archives gentop oldlib ... ++func_extract_archives () ++{ ++ $opt_debug ++ my_gentop="$1"; shift ++ my_oldlibs=${1+"$@"} ++ my_oldobjs="" ++ my_xlib="" ++ my_xabs="" ++ my_xdir="" ++ ++ for my_xlib in $my_oldlibs; do ++ # Extract the objects. ++ case $my_xlib in ++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; ++ *) my_xabs=`pwd`"/$my_xlib" ;; ++ esac ++ func_basename "$my_xlib" ++ my_xlib="$func_basename_result" ++ my_xlib_u=$my_xlib ++ while :; do ++ case " $extracted_archives " in ++ *" $my_xlib_u "*) ++ func_arith $extracted_serial + 1 ++ extracted_serial=$func_arith_result ++ my_xlib_u=lt$extracted_serial-$my_xlib ;; ++ *) break ;; ++ esac ++ done ++ extracted_archives="$extracted_archives $my_xlib_u" ++ my_xdir="$my_gentop/$my_xlib_u" ++ ++ func_mkdir_p "$my_xdir" ++ ++ case $host in ++ *-darwin*) ++ func_verbose "Extracting $my_xabs" ++ # Do not bother doing anything if just a dry run ++ $opt_dry_run || { ++ darwin_orig_dir=`pwd` ++ cd $my_xdir || exit $? ++ darwin_archive=$my_xabs ++ darwin_curdir=`pwd` ++ darwin_base_archive=`basename "$darwin_archive"` ++ darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` ++ if test -n "$darwin_arches"; then ++ darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` ++ darwin_arch= ++ func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" ++ for darwin_arch in $darwin_arches ; do ++ func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" ++ $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" ++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" ++ func_extract_an_archive "`pwd`" "${darwin_base_archive}" ++ cd "$darwin_curdir" ++ $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" ++ done # $darwin_arches ++ ## Okay now we've a bunch of thin objects, gotta fatten them up :) ++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` ++ darwin_file= ++ darwin_files= ++ for darwin_file in $darwin_filelist; do ++ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` ++ $LIPO -create -output "$darwin_file" $darwin_files ++ done # $darwin_filelist ++ $RM -rf unfat-$$ ++ cd "$darwin_orig_dir" ++ else ++ cd $darwin_orig_dir ++ func_extract_an_archive "$my_xdir" "$my_xabs" ++ fi # $darwin_arches ++ } # !$opt_dry_run ++ ;; ++ *) ++ func_extract_an_archive "$my_xdir" "$my_xabs" ++ ;; ++ esac ++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` ++ done ++ ++ func_extract_archives_result="$my_oldobjs" ++} ++ ++ ++ ++# func_emit_wrapper_part1 [arg=no] ++# ++# Emit the first part of a libtool wrapper script on stdout. ++# For more information, see the description associated with ++# func_emit_wrapper(), below. ++func_emit_wrapper_part1 () ++{ ++ func_emit_wrapper_part1_arg1=no ++ if test -n "$1" ; then ++ func_emit_wrapper_part1_arg1=$1 ++ fi ++ ++ $ECHO "\ ++#! $SHELL ++ ++# $output - temporary wrapper script for $objdir/$outputname ++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION ++# ++# The $output program cannot be directly executed until all the libtool ++# libraries that it depends on are installed. ++# ++# This wrapper script should never be moved out of the build directory. ++# If it is, it will not operate correctly. ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed='${SED} -e 1s/^X//' ++sed_quote_subst='$sed_quote_subst' ++ ++# Be Bourne compatible ++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' ++ setopt NO_GLOB_SUBST ++else ++ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++relink_command=\"$relink_command\" ++ ++# This environment variable determines our operation mode. ++if test \"\$libtool_install_magic\" = \"$magic\"; then ++ # install mode needs the following variables: ++ generated_by_libtool_version='$macro_version' ++ notinst_deplibs='$notinst_deplibs' ++else ++ # When we are sourced in execute mode, \$file and \$ECHO are already set. ++ if test \"\$libtool_execute_magic\" != \"$magic\"; then ++ ECHO=\"$qecho\" ++ file=\"\$0\" ++ # Make sure echo works. ++ if test \"X\$1\" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++ elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then ++ # Yippee, \$ECHO works! ++ : ++ else ++ # Restart under the correct shell, and then maybe \$ECHO will work. ++ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} ++ fi ++ fi\ ++" ++ $ECHO "\ ++ ++ # Find the directory that this script lives in. ++ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` ++ test \"x\$thisdir\" = \"x\$file\" && thisdir=. ++ ++ # Follow symbolic links until we get to the real thisdir. ++ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` ++ while test -n \"\$file\"; do ++ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` ++ ++ # If there was a directory component, then change thisdir. ++ if test \"x\$destdir\" != \"x\$file\"; then ++ case \"\$destdir\" in ++ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; ++ *) thisdir=\"\$thisdir/\$destdir\" ;; ++ esac ++ fi ++ ++ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` ++ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` ++ done ++" ++} ++# end: func_emit_wrapper_part1 ++ ++# func_emit_wrapper_part2 [arg=no] ++# ++# Emit the second part of a libtool wrapper script on stdout. ++# For more information, see the description associated with ++# func_emit_wrapper(), below. ++func_emit_wrapper_part2 () ++{ ++ func_emit_wrapper_part2_arg1=no ++ if test -n "$1" ; then ++ func_emit_wrapper_part2_arg1=$1 ++ fi ++ ++ $ECHO "\ ++ ++ # Usually 'no', except on cygwin/mingw when embedded into ++ # the cwrapper. ++ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 ++ if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then ++ # special case for '.' ++ if test \"\$thisdir\" = \".\"; then ++ thisdir=\`pwd\` ++ fi ++ # remove .libs from thisdir ++ case \"\$thisdir\" in ++ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; ++ $objdir ) thisdir=. ;; ++ esac ++ fi ++ ++ # Try to get the absolute directory name. ++ absdir=\`cd \"\$thisdir\" && pwd\` ++ test -n \"\$absdir\" && thisdir=\"\$absdir\" ++" ++ ++ if test "$fast_install" = yes; then ++ $ECHO "\ ++ program=lt-'$outputname'$exeext ++ progdir=\"\$thisdir/$objdir\" ++ ++ if test ! -f \"\$progdir/\$program\" || ++ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ ++ test \"X\$file\" != \"X\$progdir/\$program\"; }; then ++ ++ file=\"\$\$-\$program\" ++ ++ if test ! -d \"\$progdir\"; then ++ $MKDIR \"\$progdir\" ++ else ++ $RM \"\$progdir/\$file\" ++ fi" ++ ++ $ECHO "\ ++ ++ # relink executable if necessary ++ if test -n \"\$relink_command\"; then ++ if relink_command_output=\`eval \$relink_command 2>&1\`; then : ++ else ++ $ECHO \"\$relink_command_output\" >&2 ++ $RM \"\$progdir/\$file\" + exit 1 + fi +- +- # Just move the object if needed +- if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then +- $show "$mv $output_obj $obj" +- if $run $mv $output_obj $obj; then : ++ fi ++ ++ $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || ++ { $RM \"\$progdir/\$program\"; ++ $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } ++ $RM \"\$progdir/\$file\" ++ fi" + else +- error=$? +- $run $rm $removelist +- exit $error ++ $ECHO "\ ++ program='$outputname' ++ progdir=\"\$thisdir/$objdir\" ++" + fi +- fi +- +- # Append the name of the non-PIC object the libtool object file. +- # Only append if the libtool object file exists. +- test -z "$run" && cat >> ${libobj}T <&2 ++ exit 1 ++ fi ++ else ++ # The program doesn't exist. ++ \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 ++ \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 ++ $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 ++ exit 1 ++ fi ++fi\ ++" ++} ++# end: func_emit_wrapper_part2 ++ ++ ++# func_emit_wrapper [arg=no] ++# ++# Emit a libtool wrapper script on stdout. ++# Don't directly open a file because we may want to ++# incorporate the script contents within a cygwin/mingw ++# wrapper executable. Must ONLY be called from within ++# func_mode_link because it depends on a number of variables ++# set therein. ++# ++# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR ++# variable will take. If 'yes', then the emitted script ++# will assume that the directory in which it is stored is ++# the $objdir directory. This is a cygwin/mingw-specific ++# behavior. ++func_emit_wrapper () ++{ ++ func_emit_wrapper_arg1=no ++ if test -n "$1" ; then ++ func_emit_wrapper_arg1=$1 ++ fi ++ ++ # split this up so that func_emit_cwrapperexe_src ++ # can call each part independently. ++ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" ++ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" ++} ++ ++ ++# func_to_host_path arg ++# ++# Convert paths to host format when used with build tools. ++# Intended for use with "native" mingw (where libtool itself ++# is running under the msys shell), or in the following cross- ++# build environments: ++# $build $host ++# mingw (msys) mingw [e.g. native] ++# cygwin mingw ++# *nix + wine mingw ++# where wine is equipped with the `winepath' executable. ++# In the native mingw case, the (msys) shell automatically ++# converts paths for any non-msys applications it launches, ++# but that facility isn't available from inside the cwrapper. ++# Similar accommodations are necessary for $host mingw and ++# $build cygwin. Calling this function does no harm for other ++# $host/$build combinations not listed above. ++# ++# ARG is the path (on $build) that should be converted to ++# the proper representation for $host. The result is stored ++# in $func_to_host_path_result. ++func_to_host_path () ++{ ++ func_to_host_path_result="$1" ++ if test -n "$1" ; then ++ case $host in ++ *mingw* ) ++ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ case $build in ++ *mingw* ) # actually, msys ++ # awkward: cmd appends spaces to result ++ lt_sed_strip_trailing_spaces="s/[ ]*\$//" ++ func_to_host_path_tmp1=`( cmd //c echo "$1" |\ ++ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` ++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ *cygwin* ) ++ func_to_host_path_tmp1=`cygpath -w "$1"` ++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ * ) ++ # Unfortunately, winepath does not exit with a non-zero ++ # error code, so we are forced to check the contents of ++ # stdout. On the other hand, if the command is not ++ # found, the shell will set an exit code of 127 and print ++ # *an error message* to stdout. So we must check for both ++ # error code of zero AND non-empty stdout, which explains ++ # the odd construction: ++ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` ++ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then ++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ else ++ # Allow warning below. ++ func_to_host_path_result="" ++ fi ++ ;; ++ esac ++ if test -z "$func_to_host_path_result" ; then ++ func_error "Could not determine host path corresponding to" ++ func_error " '$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback: ++ func_to_host_path_result="$1" ++ fi ++ ;; ++ esac ++ fi ++} ++# end: func_to_host_path ++ ++# func_to_host_pathlist arg ++# ++# Convert pathlists to host format when used with build tools. ++# See func_to_host_path(), above. This function supports the ++# following $build/$host combinations (but does no harm for ++# combinations not listed here): ++# $build $host ++# mingw (msys) mingw [e.g. native] ++# cygwin mingw ++# *nix + wine mingw ++# ++# Path separators are also converted from $build format to ++# $host format. If ARG begins or ends with a path separator ++# character, it is preserved (but converted to $host format) ++# on output. ++# ++# ARG is a pathlist (on $build) that should be converted to ++# the proper representation on $host. The result is stored ++# in $func_to_host_pathlist_result. ++func_to_host_pathlist () ++{ ++ func_to_host_pathlist_result="$1" ++ if test -n "$1" ; then ++ case $host in ++ *mingw* ) ++ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ # Remove leading and trailing path separator characters from ++ # ARG. msys behavior is inconsistent here, cygpath turns them ++ # into '.;' and ';.', and winepath ignores them completely. ++ func_to_host_pathlist_tmp2="$1" ++ # Once set for this call, this variable should not be ++ # reassigned. It is used in tha fallback case. ++ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ ++ $SED -e 's|^:*||' -e 's|:*$||'` ++ case $build in ++ *mingw* ) # Actually, msys. ++ # Awkward: cmd appends spaces to result. ++ lt_sed_strip_trailing_spaces="s/[ ]*\$//" ++ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ ++ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` ++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ *cygwin* ) ++ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` ++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ * ) ++ # unfortunately, winepath doesn't convert pathlists ++ func_to_host_pathlist_result="" ++ func_to_host_pathlist_oldIFS=$IFS ++ IFS=: ++ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do ++ IFS=$func_to_host_pathlist_oldIFS ++ if test -n "$func_to_host_pathlist_f" ; then ++ func_to_host_path "$func_to_host_pathlist_f" ++ if test -n "$func_to_host_path_result" ; then ++ if test -z "$func_to_host_pathlist_result" ; then ++ func_to_host_pathlist_result="$func_to_host_path_result" ++ else ++ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" ++ fi ++ fi ++ fi ++ IFS=: ++ done ++ IFS=$func_to_host_pathlist_oldIFS ++ ;; ++ esac ++ if test -z "$func_to_host_pathlist_result" ; then ++ func_error "Could not determine the host path(s) corresponding to" ++ func_error " '$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback. This may break if $1 contains DOS-style drive ++ # specifications. The fix is not to complicate the expression ++ # below, but for the user to provide a working wine installation ++ # with winepath so that path translation in the cross-to-mingw ++ # case works properly. ++ lt_replace_pathsep_nix_to_dos="s|:|;|g" ++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ ++ $SED -e "$lt_replace_pathsep_nix_to_dos"` ++ fi ++ # Now, add the leading and trailing path separators back ++ case "$1" in ++ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" ++ ;; ++ esac ++ case "$1" in ++ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++} ++# end: func_to_host_pathlist ++ ++# func_emit_cwrapperexe_src ++# emit the source code for a wrapper executable on stdout ++# Must ONLY be called from within func_mode_link because ++# it depends on a number of variable set therein. ++func_emit_cwrapperexe_src () ++{ ++ cat <> ${libobj}T < ++#include ++#ifdef _MSC_VER ++# include ++# include ++# include ++# define setmode _setmode ++#else ++# include ++# include ++# ifdef __CYGWIN__ ++# include ++# define HAVE_SETENV ++# ifdef __STRICT_ANSI__ ++char *realpath (const char *, char *); ++int putenv (char *); ++int setenv (const char *, const char *, int); ++# endif ++# endif ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#if defined(PATH_MAX) ++# define LT_PATHMAX PATH_MAX ++#elif defined(MAXPATHLEN) ++# define LT_PATHMAX MAXPATHLEN ++#else ++# define LT_PATHMAX 1024 ++#endif ++ ++#ifndef S_IXOTH ++# define S_IXOTH 0 ++#endif ++#ifndef S_IXGRP ++# define S_IXGRP 0 ++#endif ++ ++#ifdef _MSC_VER ++# define S_IXUSR _S_IEXEC ++# define stat _stat ++# ifndef _INTPTR_T_DEFINED ++# define intptr_t int ++# endif ++#endif ++ ++#ifndef DIR_SEPARATOR ++# define DIR_SEPARATOR '/' ++# define PATH_SEPARATOR ':' ++#endif ++ ++#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ ++ defined (__OS2__) ++# define HAVE_DOS_BASED_FILE_SYSTEM ++# define FOPEN_WB "wb" ++# ifndef DIR_SEPARATOR_2 ++# define DIR_SEPARATOR_2 '\\' ++# endif ++# ifndef PATH_SEPARATOR_2 ++# define PATH_SEPARATOR_2 ';' ++# endif ++#endif ++ ++#ifndef DIR_SEPARATOR_2 ++# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) ++#else /* DIR_SEPARATOR_2 */ ++# define IS_DIR_SEPARATOR(ch) \ ++ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) ++#endif /* DIR_SEPARATOR_2 */ ++ ++#ifndef PATH_SEPARATOR_2 ++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) ++#else /* PATH_SEPARATOR_2 */ ++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) ++#endif /* PATH_SEPARATOR_2 */ ++ ++#ifdef __CYGWIN__ ++# define FOPEN_WB "wb" ++#endif ++ ++#ifndef FOPEN_WB ++# define FOPEN_WB "w" ++#endif ++#ifndef _O_BINARY ++# define _O_BINARY 0 ++#endif ++ ++#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) ++#define XFREE(stale) do { \ ++ if (stale) { free ((void *) stale); stale = 0; } \ ++} while (0) ++ ++#undef LTWRAPPER_DEBUGPRINTF ++#if defined DEBUGWRAPPER ++# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args ++static void ++ltwrapper_debugprintf (const char *fmt, ...) ++{ ++ va_list args; ++ va_start (args, fmt); ++ (void) vfprintf (stderr, fmt, args); ++ va_end (args); ++} ++#else ++# define LTWRAPPER_DEBUGPRINTF(args) ++#endif ++ ++const char *program_name = NULL; ++ ++void *xmalloc (size_t num); ++char *xstrdup (const char *string); ++const char *base_name (const char *name); ++char *find_executable (const char *wrapper); ++char *chase_symlinks (const char *pathspec); ++int make_executable (const char *path); ++int check_executable (const char *path); ++char *strendzap (char *str, const char *pat); ++void lt_fatal (const char *message, ...); ++void lt_setenv (const char *name, const char *value); ++char *lt_extend_str (const char *orig_value, const char *add, int to_end); ++void lt_opt_process_env_set (const char *arg); ++void lt_opt_process_env_prepend (const char *arg); ++void lt_opt_process_env_append (const char *arg); ++int lt_split_name_value (const char *arg, char** name, char** value); ++void lt_update_exe_path (const char *name, const char *value); ++void lt_update_lib_path (const char *name, const char *value); ++ ++static const char *script_text_part1 = + EOF +- fi +- +- $run $mv "${libobj}T" "${libobj}" +- +- # Unlock the critical section if it was locked +- if test "$need_locks" != no; then +- $run $rm "$lockfile" +- fi +- +- exit 0 +- ;; +- +- # libtool link mode +- link | relink) +- modename="$modename: link" ++ ++ func_emit_wrapper_part1 yes | ++ $SED -e 's/\([\\"]\)/\\\1/g' \ ++ -e 's/^/ "/' -e 's/$/\\n"/' ++ echo ";" ++ cat <"))); ++ for (i = 0; i < newargc; i++) ++ { ++ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); ++ } ++ ++EOF ++ ++ case $host_os in ++ mingw*) ++ cat <<"EOF" ++ /* execv doesn't actually work on mingw as expected on unix */ ++ rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); ++ if (rval == -1) ++ { ++ /* failed to start process */ ++ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); ++ return 127; ++ } ++ return rval; ++EOF ++ ;; ++ *) ++ cat <<"EOF" ++ execv (lt_argv_zero, newargz); ++ return rval; /* =127, but avoids unused variable warning */ ++EOF ++ ;; ++ esac ++ ++ cat <<"EOF" ++} ++ ++void * ++xmalloc (size_t num) ++{ ++ void *p = (void *) malloc (num); ++ if (!p) ++ lt_fatal ("Memory exhausted"); ++ ++ return p; ++} ++ ++char * ++xstrdup (const char *string) ++{ ++ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), ++ string) : NULL; ++} ++ ++const char * ++base_name (const char *name) ++{ ++ const char *base; ++ ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ /* Skip over the disk name in MSDOS pathnames. */ ++ if (isalpha ((unsigned char) name[0]) && name[1] == ':') ++ name += 2; ++#endif ++ ++ for (base = name; *name; name++) ++ if (IS_DIR_SEPARATOR (*name)) ++ base = name + 1; ++ return base; ++} ++ ++int ++check_executable (const char *path) ++{ ++ struct stat st; ++ ++ LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", ++ path ? (*path ? path : "EMPTY!") : "NULL!")); ++ if ((!path) || (!*path)) ++ return 0; ++ ++ if ((stat (path, &st) >= 0) ++ && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) ++ return 1; ++ else ++ return 0; ++} ++ ++int ++make_executable (const char *path) ++{ ++ int rval = 0; ++ struct stat st; ++ ++ LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", ++ path ? (*path ? path : "EMPTY!") : "NULL!")); ++ if ((!path) || (!*path)) ++ return 0; ++ ++ if (stat (path, &st) >= 0) ++ { ++ rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); ++ } ++ return rval; ++} ++ ++/* Searches for the full path of the wrapper. Returns ++ newly allocated full path name if found, NULL otherwise ++ Does not chase symlinks, even on platforms that support them. ++*/ ++char * ++find_executable (const char *wrapper) ++{ ++ int has_slash = 0; ++ const char *p; ++ const char *p_next; ++ /* static buffer for getcwd */ ++ char tmp[LT_PATHMAX + 1]; ++ int tmp_len; ++ char *concat_name; ++ ++ LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", ++ wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); ++ ++ if ((wrapper == NULL) || (*wrapper == '\0')) ++ return NULL; ++ ++ /* Absolute path? */ ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') ++ { ++ concat_name = xstrdup (wrapper); ++ if (check_executable (concat_name)) ++ return concat_name; ++ XFREE (concat_name); ++ } ++ else ++ { ++#endif ++ if (IS_DIR_SEPARATOR (wrapper[0])) ++ { ++ concat_name = xstrdup (wrapper); ++ if (check_executable (concat_name)) ++ return concat_name; ++ XFREE (concat_name); ++ } ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ } ++#endif ++ ++ for (p = wrapper; *p; p++) ++ if (*p == '/') ++ { ++ has_slash = 1; ++ break; ++ } ++ if (!has_slash) ++ { ++ /* no slashes; search PATH */ ++ const char *path = getenv ("PATH"); ++ if (path != NULL) ++ { ++ for (p = path; *p; p = p_next) ++ { ++ const char *q; ++ size_t p_len; ++ for (q = p; *q; q++) ++ if (IS_PATH_SEPARATOR (*q)) ++ break; ++ p_len = q - p; ++ p_next = (*q == '\0' ? q : q + 1); ++ if (p_len == 0) ++ { ++ /* empty path: current directory */ ++ if (getcwd (tmp, LT_PATHMAX) == NULL) ++ lt_fatal ("getcwd failed"); ++ tmp_len = strlen (tmp); ++ concat_name = ++ XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); ++ memcpy (concat_name, tmp, tmp_len); ++ concat_name[tmp_len] = '/'; ++ strcpy (concat_name + tmp_len + 1, wrapper); ++ } ++ else ++ { ++ concat_name = ++ XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); ++ memcpy (concat_name, p, p_len); ++ concat_name[p_len] = '/'; ++ strcpy (concat_name + p_len + 1, wrapper); ++ } ++ if (check_executable (concat_name)) ++ return concat_name; ++ XFREE (concat_name); ++ } ++ } ++ /* not found in PATH; assume curdir */ ++ } ++ /* Relative path | not found in path: prepend cwd */ ++ if (getcwd (tmp, LT_PATHMAX) == NULL) ++ lt_fatal ("getcwd failed"); ++ tmp_len = strlen (tmp); ++ concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); ++ memcpy (concat_name, tmp, tmp_len); ++ concat_name[tmp_len] = '/'; ++ strcpy (concat_name + tmp_len + 1, wrapper); ++ ++ if (check_executable (concat_name)) ++ return concat_name; ++ XFREE (concat_name); ++ return NULL; ++} ++ ++char * ++chase_symlinks (const char *pathspec) ++{ ++#ifndef S_ISLNK ++ return xstrdup (pathspec); ++#else ++ char buf[LT_PATHMAX]; ++ struct stat s; ++ char *tmp_pathspec = xstrdup (pathspec); ++ char *p; ++ int has_symlinks = 0; ++ while (strlen (tmp_pathspec) && !has_symlinks) ++ { ++ LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", ++ tmp_pathspec)); ++ if (lstat (tmp_pathspec, &s) == 0) ++ { ++ if (S_ISLNK (s.st_mode) != 0) ++ { ++ has_symlinks = 1; ++ break; ++ } ++ ++ /* search backwards for last DIR_SEPARATOR */ ++ p = tmp_pathspec + strlen (tmp_pathspec) - 1; ++ while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) ++ p--; ++ if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) ++ { ++ /* no more DIR_SEPARATORS left */ ++ break; ++ } ++ *p = '\0'; ++ } ++ else ++ { ++ char *errstr = strerror (errno); ++ lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); ++ } ++ } ++ XFREE (tmp_pathspec); ++ ++ if (!has_symlinks) ++ { ++ return xstrdup (pathspec); ++ } ++ ++ tmp_pathspec = realpath (pathspec, buf); ++ if (tmp_pathspec == 0) ++ { ++ lt_fatal ("Could not follow symlinks for %s", pathspec); ++ } ++ return xstrdup (tmp_pathspec); ++#endif ++} ++ ++char * ++strendzap (char *str, const char *pat) ++{ ++ size_t len, patlen; ++ ++ assert (str != NULL); ++ assert (pat != NULL); ++ ++ len = strlen (str); ++ patlen = strlen (pat); ++ ++ if (patlen <= len) ++ { ++ str += len - patlen; ++ if (strcmp (str, pat) == 0) ++ *str = '\0'; ++ } ++ return str; ++} ++ ++static void ++lt_error_core (int exit_status, const char *mode, ++ const char *message, va_list ap) ++{ ++ fprintf (stderr, "%s: %s: ", program_name, mode); ++ vfprintf (stderr, message, ap); ++ fprintf (stderr, ".\n"); ++ ++ if (exit_status >= 0) ++ exit (exit_status); ++} ++ ++void ++lt_fatal (const char *message, ...) ++{ ++ va_list ap; ++ va_start (ap, message); ++ lt_error_core (EXIT_FAILURE, "FATAL", message, ap); ++ va_end (ap); ++} ++ ++void ++lt_setenv (const char *name, const char *value) ++{ ++ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", ++ (name ? name : ""), ++ (value ? value : ""))); ++ { ++#ifdef HAVE_SETENV ++ /* always make a copy, for consistency with !HAVE_SETENV */ ++ char *str = xstrdup (value); ++ setenv (name, str, 1); ++#else ++ int len = strlen (name) + 1 + strlen (value) + 1; ++ char *str = XMALLOC (char, len); ++ sprintf (str, "%s=%s", name, value); ++ if (putenv (str) != EXIT_SUCCESS) ++ { ++ XFREE (str); ++ } ++#endif ++ } ++} ++ ++char * ++lt_extend_str (const char *orig_value, const char *add, int to_end) ++{ ++ char *new_value; ++ if (orig_value && *orig_value) ++ { ++ int orig_value_len = strlen (orig_value); ++ int add_len = strlen (add); ++ new_value = XMALLOC (char, add_len + orig_value_len + 1); ++ if (to_end) ++ { ++ strcpy (new_value, orig_value); ++ strcpy (new_value + orig_value_len, add); ++ } ++ else ++ { ++ strcpy (new_value, add); ++ strcpy (new_value + add_len, orig_value); ++ } ++ } ++ else ++ { ++ new_value = xstrdup (add); ++ } ++ return new_value; ++} ++ ++int ++lt_split_name_value (const char *arg, char** name, char** value) ++{ ++ const char *p; ++ int len; ++ if (!arg || !*arg) ++ return 1; ++ ++ p = strchr (arg, (int)'='); ++ ++ if (!p) ++ return 1; ++ ++ *value = xstrdup (++p); ++ ++ len = strlen (arg) - strlen (*value); ++ *name = XMALLOC (char, len); ++ strncpy (*name, arg, len-1); ++ (*name)[len - 1] = '\0'; ++ ++ return 0; ++} ++ ++void ++lt_opt_process_env_set (const char *arg) ++{ ++ char *name = NULL; ++ char *value = NULL; ++ ++ if (lt_split_name_value (arg, &name, &value) != 0) ++ { ++ XFREE (name); ++ XFREE (value); ++ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); ++ } ++ ++ lt_setenv (name, value); ++ XFREE (name); ++ XFREE (value); ++} ++ ++void ++lt_opt_process_env_prepend (const char *arg) ++{ ++ char *name = NULL; ++ char *value = NULL; ++ char *new_value = NULL; ++ ++ if (lt_split_name_value (arg, &name, &value) != 0) ++ { ++ XFREE (name); ++ XFREE (value); ++ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); ++ } ++ ++ new_value = lt_extend_str (getenv (name), value, 0); ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ XFREE (name); ++ XFREE (value); ++} ++ ++void ++lt_opt_process_env_append (const char *arg) ++{ ++ char *name = NULL; ++ char *value = NULL; ++ char *new_value = NULL; ++ ++ if (lt_split_name_value (arg, &name, &value) != 0) ++ { ++ XFREE (name); ++ XFREE (value); ++ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); ++ } ++ ++ new_value = lt_extend_str (getenv (name), value, 1); ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ XFREE (name); ++ XFREE (value); ++} ++ ++void ++lt_update_exe_path (const char *name, const char *value) ++{ ++ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", ++ (name ? name : ""), ++ (value ? value : ""))); ++ ++ if (name && *name && value && *value) ++ { ++ char *new_value = lt_extend_str (getenv (name), value, 0); ++ /* some systems can't cope with a ':'-terminated path #' */ ++ int len = strlen (new_value); ++ while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) ++ { ++ new_value[len-1] = '\0'; ++ } ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ } ++} ++ ++void ++lt_update_lib_path (const char *name, const char *value) ++{ ++ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", ++ (name ? name : ""), ++ (value ? value : ""))); ++ ++ if (name && *name && value && *value) ++ { ++ char *new_value = lt_extend_str (getenv (name), value, 0); ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ } ++} ++ ++ ++EOF ++} ++# end: func_emit_cwrapperexe_src ++ ++# func_mode_link arg... ++func_mode_link () ++{ ++ $opt_debug + case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # which system we are compiling for in order to pass an extra +@@ -857,10 +4051,10 @@ + allow_undefined=yes + ;; + esac +- libtool_args="$nonopt" ++ libtool_args=$nonopt + base_compile="$nonopt $@" +- compile_command="$nonopt" +- finalize_command="$nonopt" ++ compile_command=$nonopt ++ finalize_command=$nonopt + + compile_rpath= + finalize_rpath= +@@ -875,6 +4069,7 @@ + dllsearchpath= + lib_search_path=`pwd` + inst_prefix_dir= ++ new_inherited_linker_flags= + + avoid_version=no + dlfiles= +@@ -903,68 +4098,46 @@ + thread_safe=no + vinfo= + vinfo_number=no +- +- # Infer tagged configuration to use if any are available and +- # if one wasn't chosen via the "--tag" command line option. +- # Only attempt this if the compiler in the base link +- # command doesn't match the default compiler. +- if test -n "$available_tags" && test -z "$tagname"; then +- case $base_compile in +- # Blanks in the command may have been stripped by the calling shell, +- # but not from the CC environment variable when configure was run. +- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;; +- # Blanks at the start of $base_compile will cause this to fail +- # if we don't check for them as well. +- *) +- for z in $available_tags; do +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then +- # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" +- case $base_compile in +- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) +- # The compiler in $compile_command matches +- # the one in the tagged configuration. +- # Assume this is the tagged configuration we want. +- tagname=$z +- break +- ;; +- esac +- fi +- done +- # If $tagname still isn't set, then no tagged configuration +- # was found and let the user know that the "--tag" command +- # line option must be used. +- if test -z "$tagname"; then +- $echo "$modename: unable to infer tagged configuration" +- $echo "$modename: specify a tag with \`--tag'" 1>&2 +- exit 1 +-# else +-# $echo "$modename: using $tagname tagged configuration" +- fi +- ;; +- esac +- fi ++ weak_libs= ++ single_module="${wl}-single_module" ++ func_infer_tag $base_compile + + # We need to know -static, to get the right output filenames. + for arg + do + case $arg in +- -all-static | -static) +- if test "X$arg" = "X-all-static"; then ++ -shared) ++ test "$build_libtool_libs" != yes && \ ++ func_fatal_configuration "can not build a shared library" ++ build_old_libs=no ++ break ++ ;; ++ -all-static | -static | -static-libtool-libs) ++ case $arg in ++ -all-static) + if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then +- $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 ++ func_warning "complete static linking is impossible in this configuration" + fi + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi +- else ++ prefer_static_libs=yes ++ ;; ++ -static) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi +- fi ++ prefer_static_libs=built ++ ;; ++ -static-libtool-libs) ++ if test -z "$pic_flag" && test -n "$link_static_flag"; then ++ dlopen_self=$dlopen_self_static ++ fi ++ prefer_static_libs=yes ++ ;; ++ esac + build_libtool_libs=no + build_old_libs=yes +- prefer_static_libs=yes + break + ;; + esac +@@ -977,20 +4150,16 @@ + while test "$#" -gt 0; do + arg="$1" + shift +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test +- ;; +- *) qarg=$arg ;; +- esac +- libtool_args="$libtool_args $qarg" ++ func_quote_for_eval "$arg" ++ qarg=$func_quote_for_eval_unquoted_result ++ func_append libtool_args " $func_quote_for_eval_result" + + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + case $prev in + output) +- compile_command="$compile_command @OUTPUT@" +- finalize_command="$finalize_command @OUTPUT@" ++ func_append compile_command " @OUTPUT@" ++ func_append finalize_command " @OUTPUT@" + ;; + esac + +@@ -998,8 +4167,8 @@ + dlfiles|dlprefiles) + if test "$preload" = no; then + # Add the symbol object into the linking commands. +- compile_command="$compile_command @SYMFILE@" +- finalize_command="$finalize_command @SYMFILE@" ++ func_append compile_command " @SYMFILE@" ++ func_append finalize_command " @SYMFILE@" + preload=yes + fi + case $arg in +@@ -1037,10 +4206,8 @@ + ;; + expsyms) + export_symbols="$arg" +- if test ! -f "$arg"; then +- $echo "$modename: symbol file \`$arg' does not exist" +- exit 1 +- fi ++ test -f "$arg" \ ++ || func_fatal_error "symbol file \`$arg' does not exist" + prev= + continue + ;; +@@ -1049,11 +4216,120 @@ + prev= + continue + ;; ++ framework) ++ case $host in ++ *-*-darwin*) ++ case "$deplibs " in ++ *" $qarg.ltframework "*) ;; ++ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later ++ ;; ++ esac ++ ;; ++ esac ++ prev= ++ continue ++ ;; + inst_prefix) + inst_prefix_dir="$arg" + prev= + continue + ;; ++ objectlist) ++ if test -f "$arg"; then ++ save_arg=$arg ++ moreargs= ++ for fil in `cat "$save_arg"` ++ do ++# moreargs="$moreargs $fil" ++ arg=$fil ++ # A libtool-controlled object. ++ ++ # Check to see that this really is a libtool object. ++ if func_lalib_unsafe_p "$arg"; then ++ pic_object= ++ non_pic_object= ++ ++ # Read the .lo file ++ func_source "$arg" ++ ++ if test -z "$pic_object" || ++ test -z "$non_pic_object" || ++ test "$pic_object" = none && ++ test "$non_pic_object" = none; then ++ func_fatal_error "cannot find name of object for \`$arg'" ++ fi ++ ++ # Extract subdirectory from the argument. ++ func_dirname "$arg" "/" "" ++ xdir="$func_dirname_result" ++ ++ if test "$pic_object" != none; then ++ # Prepend the subdirectory the object is found in. ++ pic_object="$xdir$pic_object" ++ ++ if test "$prev" = dlfiles; then ++ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then ++ dlfiles="$dlfiles $pic_object" ++ prev= ++ continue ++ else ++ # If libtool objects are unsupported, then we need to preload. ++ prev=dlprefiles ++ fi ++ fi ++ ++ # CHECK ME: I think I busted this. -Ossama ++ if test "$prev" = dlprefiles; then ++ # Preload the old-style object. ++ dlprefiles="$dlprefiles $pic_object" ++ prev= ++ fi ++ ++ # A PIC object. ++ func_append libobjs " $pic_object" ++ arg="$pic_object" ++ fi ++ ++ # Non-PIC object. ++ if test "$non_pic_object" != none; then ++ # Prepend the subdirectory the object is found in. ++ non_pic_object="$xdir$non_pic_object" ++ ++ # A standard non-PIC object ++ func_append non_pic_objects " $non_pic_object" ++ if test -z "$pic_object" || test "$pic_object" = none ; then ++ arg="$non_pic_object" ++ fi ++ else ++ # If the PIC object exists, use it instead. ++ # $xdir was prepended to $pic_object above. ++ non_pic_object="$pic_object" ++ func_append non_pic_objects " $non_pic_object" ++ fi ++ else ++ # Only an error if not doing a dry-run. ++ if $opt_dry_run; then ++ # Extract subdirectory from the argument. ++ func_dirname "$arg" "/" "" ++ xdir="$func_dirname_result" ++ ++ func_lo2o "$arg" ++ pic_object=$xdir$objdir/$func_lo2o_result ++ non_pic_object=$xdir$func_lo2o_result ++ func_append libobjs " $pic_object" ++ func_append non_pic_objects " $non_pic_object" ++ else ++ func_fatal_error "\`$arg' is not a valid libtool object" ++ fi ++ fi ++ done ++ else ++ func_fatal_error "link input file \`$arg' does not exist" ++ fi ++ arg=$save_arg ++ prev= ++ continue ++ ;; + precious_regex) + precious_files_regex="$arg" + prev= +@@ -1064,120 +4340,12 @@ + prev= + continue + ;; +- objectlist) +- if test -f "$arg"; then +- save_arg=$arg +- moreargs= +- for fil in `cat $save_arg` +- do +-# moreargs="$moreargs $fil" +- arg=$fil +- # A libtool-controlled object. +- +- # Check to see that this really is a libtool object. +- if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then +- pic_object= +- non_pic_object= +- +- # Read the .lo file +- # If there is no directory component, then add one. +- case $arg in +- */* | *\\*) . $arg ;; +- *) . ./$arg ;; +- esac +- +- if test -z "$pic_object" || \ +- test -z "$non_pic_object" || +- test "$pic_object" = none && \ +- test "$non_pic_object" = none; then +- $echo "$modename: cannot find name of object for \`$arg'" 1>&2 +- exit 1 +- fi +- +- # Extract subdirectory from the argument. +- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` +- if test "X$xdir" = "X$arg"; then +- xdir= +- else +- xdir="$xdir/" +- fi +- +- if test "$pic_object" != none; then +- # Prepend the subdirectory the object is found in. +- pic_object="$xdir$pic_object" +- +- if test "$prev" = dlfiles; then +- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" +- prev= +- continue +- else +- # If libtool objects are unsupported, then we need to preload. +- prev=dlprefiles +- fi +- fi +- +- # CHECK ME: I think I busted this. -Ossama +- if test "$prev" = dlprefiles; then +- # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" +- prev= +- fi +- +- # A PIC object. +- libobjs="$libobjs $pic_object" +- arg="$pic_object" +- fi +- +- # Non-PIC object. +- if test "$non_pic_object" != none; then +- # Prepend the subdirectory the object is found in. +- non_pic_object="$xdir$non_pic_object" +- +- # A standard non-PIC object +- non_pic_objects="$non_pic_objects $non_pic_object" +- if test -z "$pic_object" || test "$pic_object" = none ; then +- arg="$non_pic_object" +- fi +- fi +- else +- # Only an error if not doing a dry-run. +- if test -z "$run"; then +- $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 +- exit 1 +- else +- # Dry-run case. +- +- # Extract subdirectory from the argument. +- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` +- if test "X$xdir" = "X$arg"; then +- xdir= +- else +- xdir="$xdir/" +- fi +- +- pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` +- non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` +- libobjs="$libobjs $pic_object" +- non_pic_objects="$non_pic_objects $non_pic_object" +- fi +- fi +- done +- else +- $echo "$modename: link input file \`$save_arg' does not exist" +- exit 1 +- fi +- arg=$save_arg +- prev= +- continue +- ;; + rpath | xrpath) + # We need an absolute path. + case $arg in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) +- $echo "$modename: only absolute run-paths are allowed" 1>&2 +- exit 1 ++ func_fatal_error "only absolute run-paths are allowed" + ;; + esac + if test "$prev" = rpath; then +@@ -1194,27 +4362,37 @@ + prev= + continue + ;; ++ shrext) ++ shrext_cmds="$arg" ++ prev= ++ continue ++ ;; ++ weak) ++ weak_libs="$weak_libs $arg" ++ prev= ++ continue ++ ;; ++ xcclinker) ++ linker_flags="$linker_flags $qarg" ++ compiler_flags="$compiler_flags $qarg" ++ prev= ++ func_append compile_command " $qarg" ++ func_append finalize_command " $qarg" ++ continue ++ ;; + xcompiler) + compiler_flags="$compiler_flags $qarg" + prev= +- compile_command="$compile_command $qarg" +- finalize_command="$finalize_command $qarg" ++ func_append compile_command " $qarg" ++ func_append finalize_command " $qarg" + continue + ;; + xlinker) + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $wl$qarg" + prev= +- compile_command="$compile_command $wl$qarg" +- finalize_command="$finalize_command $wl$qarg" +- continue +- ;; +- xcclinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $qarg" +- prev= +- compile_command="$compile_command $qarg" +- finalize_command="$finalize_command $qarg" ++ func_append compile_command " $wl$qarg" ++ func_append finalize_command " $wl$qarg" + continue + ;; + *) +@@ -1230,16 +4408,16 @@ + case $arg in + -all-static) + if test -n "$link_static_flag"; then +- compile_command="$compile_command $link_static_flag" +- finalize_command="$finalize_command $link_static_flag" ++ # See comment for -static flag below, for more details. ++ func_append compile_command " $link_static_flag" ++ func_append finalize_command " $link_static_flag" + fi + continue + ;; + + -allow-undefined) + # FIXME: remove this flag sometime in the future. +- $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 +- continue ++ func_fatal_error "\`-allow-undefined' must not be used because it is the default" + ;; + + -avoid-version) +@@ -1264,8 +4442,7 @@ + + -export-symbols | -export-symbols-regex) + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then +- $echo "$modename: more than one -exported-symbols argument is not allowed" +- exit 1 ++ func_fatal_error "more than one -exported-symbols argument is not allowed" + fi + if test "X$arg" = "X-export-symbols"; then + prev=expsyms +@@ -1275,6 +4452,11 @@ + continue + ;; + ++ -framework) ++ prev=framework ++ continue ++ ;; ++ + -inst-prefix-dir) + prev=inst_prefix + continue +@@ -1285,24 +4467,30 @@ + -L[A-Z][A-Z]*:*) + case $with_gcc/$host in + no/*-*-irix* | /*-*-irix*) +- compile_command="$compile_command $arg" +- finalize_command="$finalize_command $arg" ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" + ;; + esac + continue + ;; + + -L*) +- dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` ++ func_stripname '-L' '' "$arg" ++ dir=$func_stripname_result ++ if test -z "$dir"; then ++ if test "$#" -gt 0; then ++ func_fatal_error "require no space between \`-L' and \`$1'" ++ else ++ func_fatal_error "need path for \`-L' option" ++ fi ++ fi + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` +- if test -z "$absdir"; then +- $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 +- exit 1 +- fi ++ test -z "$absdir" && \ ++ func_fatal_error "cannot determine absolute directory name of \`$dir'" + dir="$absdir" + ;; + esac +@@ -1314,11 +4502,18 @@ + ;; + esac + case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) ++ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; ++ ::) dllsearchpath=$dir;; + *) dllsearchpath="$dllsearchpath:$dir";; + esac ++ case :$dllsearchpath: in ++ *":$testbindir:"*) ;; ++ ::) dllsearchpath=$testbindir;; ++ *) dllsearchpath="$dllsearchpath:$testbindir";; ++ esac + ;; + esac + continue +@@ -1327,26 +4522,35 @@ + -l*) + if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + case $host in +- *-*-cygwin* | *-*-pw32* | *-*-beos*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) + # These systems don't actually have a C or math library (as such) + continue + ;; +- *-*-mingw* | *-*-os2*) ++ *-*-os2*) + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework +- deplibs="$deplibs -framework System" ++ deplibs="$deplibs System.ltframework" + continue ++ ;; ++ *-*-sco3.2v5* | *-*-sco5v6*) ++ # Causes problems with __ctype ++ test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) ++ # Compiler inserts libc in the correct place for threads to work ++ test "X$arg" = "X-lc" && continue ++ ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1356,41 +4560,35 @@ + continue + ;; + +- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) +- deplibs="$deplibs $arg" +- continue +- ;; +- + -module) + module=yes + continue + ;; + +- # gcc -m* arguments should be passed to the linker via $compiler_flags +- # in order to pass architecture information to the linker +- # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo +- # but this is not reliable with gcc because gcc may use -mfoo to +- # select a different linker, different libraries, etc, while +- # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) +- # Unknown arguments in both finalize_command and compile_command need +- # to be aesthetically quoted because they are evaled later. +- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" +- ;; ++ # Tru64 UNIX uses -model [arg] to determine the layout of C++ ++ # classes, name mangling, and exception handling. ++ # Darwin uses the -arch flag to determine output architecture. ++ -model|-arch|-isysroot) ++ compiler_flags="$compiler_flags $arg" ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ prev=xcompiler ++ continue ++ ;; ++ ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ compiler_flags="$compiler_flags $arg" ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ case "$new_inherited_linker_flags " in ++ *" $arg "*) ;; ++ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; + esac +- compile_command="$compile_command $arg" +- finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then +- compiler_flags="$compiler_flags $arg" +- fi +- continue +- ;; +- +- -shrext) +- prev=shrext ++ continue ++ ;; ++ ++ -multi_module) ++ single_module="${wl}-multi_module" + continue + ;; + +@@ -1401,11 +4599,11 @@ + + -no-install) + case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) + # The PATH hackery in wrapper scripts is required on Windows +- # in order for the loader to find any dlls it needs. +- $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 +- $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 ++ # and Darwin in order for the loader to find any dlls it needs. ++ func_warning "\`-no-install' is ignored for $host" ++ func_warning "assuming \`-no-fast-install' instead" + fast_install=no + ;; + *) no_install=yes ;; +@@ -1446,13 +4644,13 @@ + ;; + + -R*) +- dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` ++ func_stripname '-R' '' "$arg" ++ dir=$func_stripname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) +- $echo "$modename: only absolute run-paths are allowed" 1>&2 +- exit 1 ++ func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in +@@ -1462,7 +4660,17 @@ + continue + ;; + +- -static) ++ -shared) ++ # The effects of -shared are defined in a previous loop. ++ continue ++ ;; ++ ++ -shrext) ++ prev=shrext ++ continue ++ ;; ++ ++ -static | -static-libtool-libs) + # The effects of -static are defined in a previous loop. + # We used to do the same as -all-static on platforms that + # didn't have a PIC flag, but the assumption that the effects +@@ -1480,47 +4688,49 @@ + prev=vinfo + continue + ;; ++ + -version-number) + prev=vinfo + vinfo_number=yes + continue + ;; + ++ -weak) ++ prev=weak ++ continue ++ ;; ++ + -Wc,*) +- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` ++ func_stripname '-Wc,' '' "$arg" ++ args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" +- case $flag in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- flag="\"$flag\"" +- ;; +- esac +- arg="$arg $wl$flag" +- compiler_flags="$compiler_flags $flag" ++ func_quote_for_eval "$flag" ++ arg="$arg $wl$func_quote_for_eval_result" ++ compiler_flags="$compiler_flags $func_quote_for_eval_result" + done + IFS="$save_ifs" +- arg=`$echo "X$arg" | $Xsed -e "s/^ //"` ++ func_stripname ' ' '' "$arg" ++ arg=$func_stripname_result + ;; + + -Wl,*) +- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` ++ func_stripname '-Wl,' '' "$arg" ++ args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" +- case $flag in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- flag="\"$flag\"" +- ;; +- esac +- arg="$arg $wl$flag" +- compiler_flags="$compiler_flags $wl$flag" +- linker_flags="$linker_flags $flag" ++ func_quote_for_eval "$flag" ++ arg="$arg $wl$func_quote_for_eval_result" ++ compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" ++ linker_flags="$linker_flags $func_quote_for_eval_result" + done + IFS="$save_ifs" +- arg=`$echo "X$arg" | $Xsed -e "s/^ //"` ++ func_stripname ' ' '' "$arg" ++ arg=$func_stripname_result + ;; + + -Xcompiler) +@@ -1538,16 +4748,36 @@ + continue + ;; + ++ # -msg_* for osf cc ++ -msg_*) ++ func_quote_for_eval "$arg" ++ arg="$func_quote_for_eval_result" ++ ;; ++ ++ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler ++ # -r[0-9][0-9]* specifies the processor on the SGI compiler ++ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler ++ # +DA*, +DD* enable 64-bit mode on the HP compiler ++ # -q* pass through compiler args for the IBM compiler ++ # -m*, -t[45]*, -txscale* pass through architecture-specific ++ # compiler args for GCC ++ # -F/path gives path to uninstalled frameworks, gcc on darwin ++ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC ++ # @file GCC response files ++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ func_quote_for_eval "$arg" ++ arg="$func_quote_for_eval_result" ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ compiler_flags="$compiler_flags $arg" ++ continue ++ ;; ++ + # Some other compiler flag. + -* | +*) +- # Unknown arguments in both finalize_command and compile_command need +- # to be aesthetically quoted because they are evaled later. +- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" +- ;; +- esac ++ func_quote_for_eval "$arg" ++ arg="$func_quote_for_eval_result" + ;; + + *.$objext) +@@ -1559,32 +4789,23 @@ + # A libtool-controlled object. + + # Check to see that this really is a libtool object. +- if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then ++ if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= + + # Read the .lo file +- # If there is no directory component, then add one. +- case $arg in +- */* | *\\*) . $arg ;; +- *) . ./$arg ;; +- esac +- +- if test -z "$pic_object" || \ ++ func_source "$arg" ++ ++ if test -z "$pic_object" || + test -z "$non_pic_object" || +- test "$pic_object" = none && \ ++ test "$pic_object" = none && + test "$non_pic_object" = none; then +- $echo "$modename: cannot find name of object for \`$arg'" 1>&2 +- exit 1 ++ func_fatal_error "cannot find name of object for \`$arg'" + fi + + # Extract subdirectory from the argument. +- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` +- if test "X$xdir" = "X$arg"; then +- xdir= +- else +- xdir="$xdir/" +- fi ++ func_dirname "$arg" "/" "" ++ xdir="$func_dirname_result" + + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. +@@ -1609,7 +4830,7 @@ + fi + + # A PIC object. +- libobjs="$libobjs $pic_object" ++ func_append libobjs " $pic_object" + arg="$pic_object" + fi + +@@ -1619,31 +4840,30 @@ + non_pic_object="$xdir$non_pic_object" + + # A standard non-PIC object +- non_pic_objects="$non_pic_objects $non_pic_object" ++ func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi ++ else ++ # If the PIC object exists, use it instead. ++ # $xdir was prepended to $pic_object above. ++ non_pic_object="$pic_object" ++ func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. +- if test -z "$run"; then +- $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 +- exit 1 ++ if $opt_dry_run; then ++ # Extract subdirectory from the argument. ++ func_dirname "$arg" "/" "" ++ xdir="$func_dirname_result" ++ ++ func_lo2o "$arg" ++ pic_object=$xdir$objdir/$func_lo2o_result ++ non_pic_object=$xdir$func_lo2o_result ++ func_append libobjs " $pic_object" ++ func_append non_pic_objects " $non_pic_object" + else +- # Dry-run case. +- +- # Extract subdirectory from the argument. +- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` +- if test "X$xdir" = "X$arg"; then +- xdir= +- else +- xdir="$xdir/" +- fi +- +- pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` +- non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` +- libobjs="$libobjs $pic_object" +- non_pic_objects="$non_pic_objects $non_pic_object" ++ func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi + ;; +@@ -1676,70 +4896,51 @@ + *) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. +- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" +- ;; +- esac ++ func_quote_for_eval "$arg" ++ arg="$func_quote_for_eval_result" + ;; + esac # arg + + # Now actually substitute the argument into the commands. + if test -n "$arg"; then +- compile_command="$compile_command $arg" +- finalize_command="$finalize_command $arg" ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" + fi + done # argument parsing loop + +- if test -n "$prev"; then +- $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- fi ++ test -n "$prev" && \ ++ func_fatal_help "the \`$prevarg' option requires an argument" + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" +- compile_command="$compile_command $arg" +- finalize_command="$finalize_command $arg" ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" + fi + + oldlibs= + # calculate the name of the file, without its directory +- outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` ++ func_basename "$output" ++ outputname="$func_basename_result" + libobjs_save="$libobjs" + + if test -n "$shlibpath_var"; then + # get the directories listed in $shlibpath_var +- eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` ++ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` + else + shlib_search_path= + fi + eval sys_lib_search_path=\"$sys_lib_search_path_spec\" + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + +- output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` +- if test "X$output_objdir" = "X$output"; then +- output_objdir="$objdir" +- else +- output_objdir="$output_objdir/$objdir" +- fi ++ func_dirname "$output" "/" "" ++ output_objdir="$func_dirname_result$objdir" + # Create the object directory. +- if test ! -d "$output_objdir"; then +- $show "$mkdir $output_objdir" +- $run $mkdir $output_objdir +- status=$? +- if test "$status" -ne 0 && test ! -d "$output_objdir"; then +- exit $status +- fi +- fi ++ func_mkdir_p "$output_objdir" + + # Determine the type of output + case $output in + "") +- $echo "$modename: you must specify an output file" 1>&2 +- $echo "$help" 1>&2 +- exit 1 ++ func_fatal_help "you must specify an output file" + ;; + *.$libext) linkmode=oldlib ;; + *.lo | *.$objext) linkmode=obj ;; +@@ -1747,22 +4948,13 @@ + *) linkmode=prog ;; # Anything else should be a program. + esac + +- case $host in +- *cygwin* | *mingw* | *pw32*) +- # don't eliminate duplcations in $postdeps and $predeps +- duplicate_compiler_generated_deps=yes +- ;; +- *) +- duplicate_compiler_generated_deps=$duplicate_deps +- ;; +- esac + specialdeplibs= + + libs= + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do +- if test "X$duplicate_deps" = "Xyes" ; then ++ if $opt_duplicate_deps ; then + case "$libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac +@@ -1777,7 +4969,7 @@ + # $postdeps and mark them as special (i.e., whose duplicates are + # not to be eliminated). + pre_post_deps= +- if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then ++ if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in + *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; +@@ -1794,15 +4986,15 @@ + need_relink=no # whether we're linking any uninstalled libtool libraries + notinst_deplibs= # not-installed libtool libraries + notinst_path= # paths that contain not-installed libtool libraries ++ + case $linkmode in + lib) +- passes="conv link" ++ passes="conv dlpreopen link" + for file in $dlfiles $dlprefiles; do + case $file in + *.la) ;; + *) +- $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 +- exit 1 ++ func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + ;; + esac + done +@@ -1818,7 +5010,20 @@ + *) passes="conv" + ;; + esac ++ + for pass in $passes; do ++ # The preopen pass in lib mode reverses $deplibs; put it back here ++ # so that -L comes before libs that need it for instance... ++ if test "$linkmode,$pass" = "lib,link"; then ++ ## FIXME: Find the place where the list is rebuilt in the wrong ++ ## order, and fix it there properly ++ tmp_deplibs= ++ for deplib in $deplibs; do ++ tmp_deplibs="$deplib $tmp_deplibs" ++ done ++ deplibs="$tmp_deplibs" ++ fi ++ + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan"; then + libs="$deplibs" +@@ -1828,39 +5033,72 @@ + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; + esac + fi ++ if test "$linkmode,$pass" = "lib,dlpreopen"; then ++ # Collect and forward deplibs of preopened libtool libs ++ for lib in $dlprefiles; do ++ # Ignore non-libtool-libs ++ dependency_libs= ++ case $lib in ++ *.la) func_source "$lib" ;; ++ esac ++ ++ # Collect preopened libtool deplibs, except any this library ++ # has declared as weak libs ++ for deplib in $dependency_libs; do ++ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` ++ case " $weak_libs " in ++ *" $deplib_base "*) ;; ++ *) deplibs="$deplibs $deplib" ;; ++ esac ++ done ++ done ++ libs="$dlprefiles" ++ fi + if test "$pass" = dlopen; then + # Collect dlpreopened libraries + save_deplibs="$deplibs" + deplibs= + fi ++ + for deplib in $libs; do + lib= + found=no + case $deplib in +- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else +- deplibs="$deplib $deplibs" ++ compiler_flags="$compiler_flags $deplib" ++ if test "$linkmode" = lib ; then ++ case "$new_inherited_linker_flags " in ++ *" $deplib "*) ;; ++ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ esac ++ fi + fi + continue + ;; + -l*) + if test "$linkmode" != lib && test "$linkmode" != prog; then +- $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 ++ func_warning "\`-l' is ignored for archives/objects" + continue + fi +- if test "$pass" = conv; then +- deplibs="$deplib $deplibs" +- continue ++ func_stripname '-l' '' "$deplib" ++ name=$func_stripname_result ++ if test "$linkmode" = lib; then ++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" ++ else ++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi +- name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` +- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do +- for search_ext in .la $shrext .so .a; do ++ for searchdir in $searchdirs; do ++ for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" + if test -f "$lib"; then +@@ -1889,21 +5127,17 @@ + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $deplib "*) +- if (${SED} -e '2q' $lib | +- grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then ++ if func_lalib_p "$lib"; then + library_names= + old_library= +- case $lib in +- */* | *\\*) . $lib ;; +- *) . ./$lib ;; +- esac ++ func_source "$lib" + for l in $old_library $library_names; do + ll="$l" + done + if test "X$ll" = "X$old_library" ; then # only static version available + found=no +- ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` +- test "X$ladir" = "X$lib" && ladir="." ++ func_dirname "$lib" "" "." ++ ladir="$func_dirname_result" + lib=$ladir/$old_library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" +@@ -1915,19 +5149,35 @@ + continue + fi + fi +- ;; ++ ;; + *) ;; + esac + fi + fi + ;; # -l ++ *.ltframework) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ if test "$linkmode" = lib ; then ++ case "$new_inherited_linker_flags " in ++ *" $deplib "*) ;; ++ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ esac ++ fi ++ fi ++ continue ++ ;; + -L*) + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" +- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` ++ func_stripname '-L' '' "$deplib" ++ newlib_search_path="$newlib_search_path $func_stripname_result" + ;; + prog) + if test "$pass" = conv; then +@@ -1936,21 +5186,23 @@ + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" +- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi ++ func_stripname '-L' '' "$deplib" ++ newlib_search_path="$newlib_search_path $func_stripname_result" + ;; + *) +- $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 ++ func_warning "\`-L' is ignored for archives/objects" + ;; + esac # linkmode + continue + ;; # -L + -R*) + if test "$pass" = link; then +- dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` ++ func_stripname '-R' '' "$deplib" ++ dir=$func_stripname_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; +@@ -1968,20 +5220,41 @@ + fi + case $linkmode in + lib) +- if test "$deplibs_check_method" != pass_all; then +- $echo +- $echo "*** Warning: Trying to link with static lib archive $deplib." +- $echo "*** I have the capability to make that library automatically link in when" +- $echo "*** you link to this library. But I can only do this if you have a" +- $echo "*** shared version of the library, which you do not appear to have" +- $echo "*** because the file extensions .$libext of this argument makes me believe" +- $echo "*** that it is just a static archive that I should not used here." +- else +- $echo +- $echo "*** Warning: Linking the shared library $output against the" +- $echo "*** static library $deplib is not portable!" +- deplibs="$deplib $deplibs" +- fi ++ # Linking convenience modules into shared libraries is allowed, ++ # but linking other static libraries is non-portable. ++ case " $dlpreconveniencelibs " in ++ *" $deplib "*) ;; ++ *) ++ valid_a_lib=no ++ case $deplibs_check_method in ++ match_pattern*) ++ set dummy $deplibs_check_method; shift ++ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` ++ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ ++ | $EGREP "$match_pattern_regex" > /dev/null; then ++ valid_a_lib=yes ++ fi ++ ;; ++ pass_all) ++ valid_a_lib=yes ++ ;; ++ esac ++ if test "$valid_a_lib" != yes; then ++ $ECHO ++ $ECHO "*** Warning: Trying to link with static lib archive $deplib." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which you do not appear to have" ++ $ECHO "*** because the file extensions .$libext of this argument makes me believe" ++ $ECHO "*** that it is just a static archive that I should not use here." ++ else ++ $ECHO ++ $ECHO "*** Warning: Linking the shared library $output against the" ++ $ECHO "*** static library $deplib is not portable!" ++ deplibs="$deplib $deplibs" ++ fi ++ ;; ++ esac + continue + ;; + prog) +@@ -2016,21 +5289,18 @@ + continue + ;; + esac # case $deplib ++ + if test "$found" = yes || test -f "$lib"; then : + else +- $echo "$modename: cannot find the library \`$lib'" 1>&2 +- exit 1 ++ func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" + fi + + # Check to see that this really is a libtool archive. +- if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : +- else +- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- exit 1 +- fi +- +- ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` +- test "X$ladir" = "X$lib" && ladir="." ++ func_lalib_unsafe_p "$lib" \ ++ || func_fatal_error "\`$lib' is not a valid libtool archive" ++ ++ func_dirname "$lib" "" "." ++ ladir="$func_dirname_result" + + dlname= + dlopen= +@@ -2038,17 +5308,28 @@ + libdir= + library_names= + old_library= ++ inherited_linker_flags= + # If the library was installed with an old release of libtool, + # it will not redefine variables installed, or shouldnotlink + installed=yes + shouldnotlink=no ++ avoidtemprpath= ++ + + # Read the .la file +- case $lib in +- */* | *\\*) . $lib ;; +- *) . ./$lib ;; +- esac +- ++ func_source "$lib" ++ ++ # Convert "-framework foo" to "foo.ltframework" ++ if test -n "$inherited_linker_flags"; then ++ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` ++ for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do ++ case " $new_inherited_linker_flags " in ++ *" $tmp_inherited_linker_flag "*) ;; ++ *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; ++ esac ++ done ++ fi ++ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then +@@ -2061,8 +5342,7 @@ + deplibs="$lib $deplibs" + if test -z "$libdir"; then + if test -z "$old_library"; then +- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 +- exit 1 ++ func_fatal_error "cannot find name of link library for \`$lib'" + fi + # It is a libtool convenience library, so add in its objects. + convenience="$convenience $ladir/$objdir/$old_library" +@@ -2070,38 +5350,37 @@ + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" +- if test "X$duplicate_deps" = "Xyes" ; then +- case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; +- esac +- fi ++ if $opt_duplicate_deps ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi + tmp_libs="$tmp_libs $deplib" + done + elif test "$linkmode" != prog && test "$linkmode" != lib; then +- $echo "$modename: \`$lib' is not a convenience library" 1>&2 +- exit 1 ++ func_fatal_error "\`$lib' is not a convenience library" + fi + continue + fi # $pass = conv + +- ++ + # Get the name of the library we link against. + linklib= + for l in $old_library $library_names; do + linklib="$l" + done + if test -z "$linklib"; then +- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 +- exit 1 ++ func_fatal_error "cannot find name of link library for \`$lib'" + fi + + # This library was specified with -dlopen. + if test "$pass" = dlopen; then + if test -z "$libdir"; then +- $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 +- exit 1 ++ func_fatal_error "cannot -dlopen a convenience library: \`$lib'" + fi +- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then ++ if test -z "$dlname" || ++ test "$dlopen_support" != yes || ++ test "$build_libtool_libs" = no; then + # If there is no dlname, no dlopen support or we're linking + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't +@@ -2119,18 +5398,19 @@ + *) + abs_ladir=`cd "$ladir" && pwd` + if test -z "$abs_ladir"; then +- $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 +- $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 ++ func_warning "cannot determine absolute directory name of \`$ladir'" ++ func_warning "passing it literally to the linker, although it might fail" + abs_ladir="$ladir" + fi + ;; + esac +- laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ++ func_basename "$lib" ++ laname="$func_basename_result" + + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then + if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then +- $echo "$modename: warning: library \`$lib' was moved." 1>&2 ++ func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" +@@ -2138,24 +5418,36 @@ + dir="$libdir" + absdir="$libdir" + fi ++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else +- dir="$ladir/$objdir" +- absdir="$abs_ladir/$objdir" +- # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" ++ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ dir="$ladir" ++ absdir="$abs_ladir" ++ # Remove this search path later ++ notinst_path="$notinst_path $abs_ladir" ++ else ++ dir="$ladir/$objdir" ++ absdir="$abs_ladir/$objdir" ++ # Remove this search path later ++ notinst_path="$notinst_path $abs_ladir" ++ fi + fi # $installed = yes +- name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` ++ func_stripname 'lib' '.la' "$laname" ++ name=$func_stripname_result + + # This library was specified with -dlpreopen. + if test "$pass" = dlpreopen; then +- if test -z "$libdir"; then +- $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 +- exit 1 ++ if test -z "$libdir" && test "$linkmode" = prog; then ++ func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + fi + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + newdlprefiles="$newdlprefiles $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + newdlprefiles="$newdlprefiles $dir/$dlname" +@@ -2177,7 +5469,7 @@ + continue + fi + +- ++ + if test "$linkmode" = prog && test "$pass" != link; then + newlib_search_path="$newlib_search_path $ladir" + deplibs="$lib $deplibs" +@@ -2191,7 +5483,9 @@ + tmp_libs= + for deplib in $dependency_libs; do + case $deplib in +- -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test ++ -L*) func_stripname '-L' '' "$deplib" ++ newlib_search_path="$newlib_search_path $func_stripname_result" ++ ;; + esac + # Need to link against all dependency_libs? + if test "$linkalldeplibs" = yes; then +@@ -2201,7 +5495,7 @@ + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi +- if test "X$duplicate_deps" = "Xyes" ; then ++ if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac +@@ -2213,14 +5507,15 @@ + + if test "$linkmode,$pass" = "prog,link"; then + if test -n "$library_names" && +- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then ++ { { test "$prefer_static_libs" = no || ++ test "$prefer_static_libs,$installed" = "built,yes"; } || ++ test -z "$old_library"; }; then + # We need to hardcode the library path +- if test -n "$shlibpath_var"; then ++ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + # Make sure the rpath contains only unique directories. +- case "$temp_rpath " in +- *" $dir "*) ;; +- *" $absdir "*) ;; +- *) temp_rpath="$temp_rpath $dir" ;; ++ case "$temp_rpath:" in ++ *"$absdir:"*) ;; ++ *) temp_rpath="$temp_rpath$absdir:" ;; + esac + fi + +@@ -2257,24 +5552,45 @@ + fi + + link_static=no # Whether the deplib will be linked statically ++ use_static_libs=$prefer_static_libs ++ if test "$use_static_libs" = built && test "$installed" = yes; then ++ use_static_libs=no ++ fi + if test -n "$library_names" && +- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then +- if test "$installed" = no; then +- notinst_deplibs="$notinst_deplibs $lib" +- need_relink=yes ++ { test "$use_static_libs" = no || test -z "$old_library"; }; then ++ case $host in ++ *cygwin* | *mingw* | *cegcc*) ++ # No point in relinking DLLs because paths are not encoded ++ notinst_deplibs="$notinst_deplibs $lib" ++ need_relink=no ++ ;; ++ *) ++ if test "$installed" = no; then ++ notinst_deplibs="$notinst_deplibs $lib" ++ need_relink=yes ++ fi ++ ;; ++ esac ++ # This is a shared library ++ ++ # Warn about portability, can't link against -module's on some ++ # systems (darwin). Don't bleat about dlopened modules though! ++ dlopenmodule="" ++ for dlpremoduletest in $dlprefiles; do ++ if test "X$dlpremoduletest" = "X$lib"; then ++ dlopenmodule="$dlpremoduletest" ++ break ++ fi ++ done ++ if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then ++ $ECHO ++ if test "$linkmode" = prog; then ++ $ECHO "*** Warning: Linking the executable $output against the loadable module" ++ else ++ $ECHO "*** Warning: Linking the shared library $output against the loadable module" ++ fi ++ $ECHO "*** $linklib is not portable!" + fi +- # This is a shared library +- +- # Warn about portability, can't link against -module's on some systems (darwin) +- if test "$shouldnotlink" = yes && test "$pass" = link ; then +- $echo +- if test "$linkmode" = prog; then +- $echo "*** Warning: Linking the executable $output against the loadable module" +- else +- $echo "*** Warning: Linking the shared library $output against the loadable module" +- fi +- $echo "*** $linklib is not portable!" +- fi + if test "$linkmode" = lib && + test "$hardcode_into_libs" = yes; then + # Hardcode the library path. +@@ -2303,17 +5619,19 @@ + if test -n "$old_archive_from_expsyms_cmds"; then + # figure out the soname + set dummy $library_names +- realname="$2" +- shift; shift +- libname=`eval \\$echo \"$libname_spec\"` ++ shift ++ realname="$1" ++ shift ++ libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname="$dlname" + elif test -n "$soname_spec"; then + # bleh windows + case $host in +- *cygwin* | mingw*) +- major=`expr $current - $age` ++ *cygwin* | mingw* | *cegcc*) ++ func_arith $current - $age ++ major=$func_arith_result + versuffix="-$major" + ;; + esac +@@ -2324,36 +5642,22 @@ + + # Make a new name for the extract_expsyms_cmds to use + soroot="$soname" +- soname=`$echo $soroot | ${SED} -e 's/^.*\///'` +- newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" ++ func_basename "$soroot" ++ soname="$func_basename_result" ++ func_stripname 'lib' '.dll' "$soname" ++ newlib=libimp-$func_stripname_result.a + + # If the library has no export list, then create one now + if test -f "$output_objdir/$soname-def"; then : + else +- $show "extracting exported symbol list from \`$soname'" +- save_ifs="$IFS"; IFS='~' +- cmds=$extract_expsyms_cmds +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" ++ func_verbose "extracting exported symbol list from \`$soname'" ++ func_execute_cmds "$extract_expsyms_cmds" 'exit $?' + fi + + # Create $newlib + if test -f "$output_objdir/$newlib"; then :; else +- $show "generating import library for \`$soname'" +- save_ifs="$IFS"; IFS='~' +- cmds=$old_archive_from_expsyms_cmds +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" ++ func_verbose "generating import library for \`$soname'" ++ func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' + fi + # make sure the library variables are pointing to the new library + dir=$output_objdir +@@ -2370,19 +5674,27 @@ + if test "$hardcode_direct" = no; then + add="$dir/$linklib" + case $host in +- *-*-sco3.2v5* ) add_dir="-L$dir" ;; ++ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; ++ *-*-sysv4*uw2*) add_dir="-L$dir" ;; ++ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ ++ *-*-unixware7*) add_dir="-L$dir" ;; + *-*-darwin* ) +- # if the lib is a module then we can not link against it, someone +- # is ignoring the new warnings I added +- if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then +- $echo "** Warning, lib $linklib is a module, not a shared library" +- if test -z "$old_library" ; then +- $echo +- $echo "** And there doesn't seem to be a static archive available" +- $echo "** The link will probably fail, sorry" +- else +- add="$dir/$old_library" +- fi ++ # if the lib is a (non-dlopened) module then we can not ++ # link against it, someone is ignoring the earlier warnings ++ if /usr/bin/file -L $add 2> /dev/null | ++ $GREP ": [^:]* bundle" >/dev/null ; then ++ if test "X$dlopenmodule" != "X$lib"; then ++ $ECHO "*** Warning: lib $linklib is a module, not a shared library" ++ if test -z "$old_library" ; then ++ $ECHO ++ $ECHO "*** And there doesn't seem to be a static archive available" ++ $ECHO "*** The link will probably fail, sorry" ++ else ++ add="$dir/$old_library" ++ fi ++ elif test -n "$old_library"; then ++ add="$dir/$old_library" ++ fi + fi + esac + elif test "$hardcode_minus_L" = no; then +@@ -2399,13 +5711,14 @@ + fi + ;; + relink) +- if test "$hardcode_direct" = yes; then ++ if test "$hardcode_direct" = yes && ++ test "$hardcode_direct_absolute" = no; then + add="$dir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$dir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then +- case "$libdir" in ++ case $libdir in + [\\/]*) + add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; +@@ -2423,8 +5736,7 @@ + esac + + if test "$lib_linked" != yes; then +- $echo "$modename: configuration error: unsupported hardcode properties" +- exit 1 ++ func_fatal_configuration "unsupported hardcode properties" + fi + + if test -n "$add_shlibpath"; then +@@ -2439,8 +5751,8 @@ + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" +- if test "$hardcode_direct" != yes && \ +- test "$hardcode_minus_L" != yes && \ ++ if test "$hardcode_direct" != yes && ++ test "$hardcode_minus_L" != yes && + test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; +@@ -2455,7 +5767,8 @@ + add_dir= + add= + # Finalize command for both is simple: just hardcode it. +- if test "$hardcode_direct" = yes; then ++ if test "$hardcode_direct" = yes && ++ test "$hardcode_direct_absolute" = no; then + add="$libdir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$libdir" +@@ -2467,17 +5780,18 @@ + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then +- if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then +- add="$inst_prefix_dir$libdir/$linklib" ++ if test -n "$inst_prefix_dir" && ++ test -f "$inst_prefix_dir$libdir/$linklib" ; then ++ add="$inst_prefix_dir$libdir/$linklib" + else +- add="$libdir/$linklib" ++ add="$libdir/$linklib" + fi + else + # We cannot seem to hardcode it, guess we'll fake it. + add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then +- case "$libdir" in ++ case $libdir in + [\\/]*) + add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; +@@ -2514,21 +5828,21 @@ + + # Just print a warning and add the library to dependency_libs so + # that the program can be linked against the static library. +- $echo +- $echo "*** Warning: This system can not link to static lib archive $lib." +- $echo "*** I have the capability to make that library automatically link in when" +- $echo "*** you link to this library. But I can only do this if you have a" +- $echo "*** shared version of the library, which you do not appear to have." ++ $ECHO ++ $ECHO "*** Warning: This system can not link to static lib archive $lib." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which you do not appear to have." + if test "$module" = yes; then +- $echo "*** But as you try to build a module library, libtool will still create " +- $echo "*** a static module, that should work as long as the dlopening application" +- $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." ++ $ECHO "*** But as you try to build a module library, libtool will still create " ++ $ECHO "*** a static module, that should work as long as the dlopening application" ++ $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." + if test -z "$global_symbol_pipe"; then +- $echo +- $echo "*** However, this would only work if libtool was able to extract symbol" +- $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" +- $echo "*** not find such a program. So, this module is probably useless." +- $echo "*** \`nm' from GNU binutils and a full rebuild may help." ++ $ECHO ++ $ECHO "*** However, this would only work if libtool was able to extract symbol" ++ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" ++ $ECHO "*** not find such a program. So, this module is probably useless." ++ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + build_libtool_libs=module +@@ -2538,8 +5852,6 @@ + fi + fi + else +- convenience="$convenience $dir/$old_library" +- old_convenience="$old_convenience $dir/$old_library" + deplibs="$dir/$old_library $deplibs" + link_static=yes + fi +@@ -2547,13 +5859,15 @@ + + if test "$linkmode" = lib; then + if test -n "$dependency_libs" && +- { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || ++ { test "$hardcode_into_libs" != yes || ++ test "$build_old_libs" = yes || + test "$link_static" = yes; }; then + # Extract -R from dependency_libs + temp_deplibs= + for libdir in $dependency_libs; do + case $libdir in +- -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` ++ -R*) func_stripname '-R' '' "$libdir" ++ temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; + *) xrpath="$xrpath $temp_xrpath";; +@@ -2571,7 +5885,7 @@ + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" +- if test "X$duplicate_deps" = "Xyes" ; then ++ if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac +@@ -2582,91 +5896,75 @@ + if test "$link_all_deplibs" != no; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do ++ path= + case $deplib in + -L*) path="$deplib" ;; + *.la) +- dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` +- test "X$dir" = "X$deplib" && dir="." ++ func_dirname "$deplib" "" "." ++ dir="$func_dirname_result" + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + *) + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then +- $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 ++ func_warning "cannot determine absolute directory name of \`$dir'" + absdir="$dir" + fi + ;; + esac +- if grep "^installed=no" $deplib > /dev/null; then +- path="$absdir/$objdir" +- else +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` +- if test -z "$libdir"; then +- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 +- exit 1 +- fi +- if test "$absdir" != "$libdir"; then +- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 +- fi +- path="$absdir" +- fi +- depdepl= ++ if $GREP "^installed=no" $deplib > /dev/null; then + case $host in + *-*-darwin*) +- # we do not want to link against static libs, but need to link against shared ++ depdepl= + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done +- if test -f "$path/$depdepl" ; then +- depdepl="$path/$depdepl" +- fi +- # do not add paths which are already there +- case " $newlib_search_path " in +- *" $path "*) ;; +- *) newlib_search_path="$newlib_search_path $path";; +- esac ++ if test -f "$absdir/$objdir/$depdepl" ; then ++ depdepl="$absdir/$objdir/$depdepl" ++ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` ++ if test -z "$darwin_install_name"; then ++ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` ++ fi ++ compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" ++ linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" ++ path= ++ fi + fi +- path="" + ;; + *) +- path="-L$path" ++ path="-L$absdir/$objdir" ++ ;; ++ esac ++ else ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ test -z "$libdir" && \ ++ func_fatal_error "\`$deplib' is not a valid libtool archive" ++ test "$absdir" != "$libdir" && \ ++ func_warning "\`$deplib' seems to be moved" ++ ++ path="-L$absdir" ++ fi + ;; +- esac +- +- ;; +- -l*) +- case $host in +- *-*-darwin*) +- # Again, we only want to link against shared libraries +- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` +- for tmp in $newlib_search_path ; do +- if test -f "$tmp/lib$tmp_libs.dylib" ; then +- eval depdepl="$tmp/lib$tmp_libs.dylib" +- break +- fi +- done +- path="" +- ;; +- *) continue ;; +- esac +- ;; +- *) continue ;; + esac + case " $deplibs " in +- *" $depdepl "*) ;; +- *) deplibs="$deplibs $depdepl" ;; +- esac +- case " $deplibs " in + *" $path "*) ;; +- *) deplibs="$deplibs $path" ;; ++ *) deplibs="$path $deplibs" ;; + esac + done + fi # link_all_deplibs != no + fi # linkmode = lib + done # for deplib in $libs ++ if test "$pass" = link; then ++ if test "$linkmode" = "prog"; then ++ compile_deplibs="$new_inherited_linker_flags $compile_deplibs" ++ finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" ++ else ++ compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ fi ++ fi + dependency_libs="$newdependency_libs" + if test "$pass" = dlpreopen; then + # Link the dlpreopened libraries before other libraries +@@ -2748,7 +6046,8 @@ + eval $var=\"$tmp_libs\" + done # for var + fi +- # Last step: remove runtime libs from dependency_libs (they stay in deplibs) ++ # Last step: remove runtime libs from dependency_libs ++ # (they stay in deplibs) + tmp_libs= + for i in $dependency_libs ; do + case " $predeps $postdeps $compiler_lib_search_path " in +@@ -2764,38 +6063,36 @@ + done # for pass + if test "$linkmode" = prog; then + dlfiles="$newdlfiles" ++ fi ++ if test "$linkmode" = prog || test "$linkmode" = lib; then + dlprefiles="$newdlprefiles" + fi + + case $linkmode in + oldlib) +- if test -n "$deplibs"; then +- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then ++ func_warning "\`-dlopen' is ignored for archives" + fi + +- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then +- $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 +- fi +- +- if test -n "$rpath"; then +- $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 +- fi +- +- if test -n "$xrpath"; then +- $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 +- fi +- +- if test -n "$vinfo"; then +- $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 +- fi +- +- if test -n "$release"; then +- $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 +- fi +- +- if test -n "$export_symbols" || test -n "$export_symbols_regex"; then +- $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 +- fi ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ func_warning "\`-l' and \`-L' are ignored for archives" ;; ++ esac ++ ++ test -n "$rpath" && \ ++ func_warning "\`-rpath' is ignored for archives" ++ ++ test -n "$xrpath" && \ ++ func_warning "\`-R' is ignored for archives" ++ ++ test -n "$vinfo" && \ ++ func_warning "\`-version-info/-version-number' is ignored for archives" ++ ++ test -n "$release" && \ ++ func_warning "\`-release' is ignored for archives" ++ ++ test -n "$export_symbols$export_symbols_regex" && \ ++ func_warning "\`-export-symbols' is ignored for archives" + + # Now set the variables for building old libraries. + build_libtool_libs=no +@@ -2807,48 +6104,48 @@ + # Make sure we only generate libraries of the form `libNAME.la'. + case $outputname in + lib*) +- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` +- eval shared_ext=\"$shrext\" ++ func_stripname 'lib' '.la' "$outputname" ++ name=$func_stripname_result ++ eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + ;; + *) +- if test "$module" = no; then +- $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- fi ++ test "$module" = no && \ ++ func_fatal_help "libtool library \`$output' must begin with \`lib'" ++ + if test "$need_lib_prefix" != no; then + # Add the "lib" prefix for modules if required +- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` +- eval shared_ext=\"$shrext\" ++ func_stripname '' '.la' "$outputname" ++ name=$func_stripname_result ++ eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + else +- libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` ++ func_stripname '' '.la' "$outputname" ++ libname=$func_stripname_result + fi + ;; + esac + + if test -n "$objs"; then + if test "$deplibs_check_method" != pass_all; then +- $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 +- exit 1 ++ func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + else +- $echo +- $echo "*** Warning: Linking the shared library $output against the non-libtool" +- $echo "*** objects $objs is not portable!" ++ $ECHO ++ $ECHO "*** Warning: Linking the shared library $output against the non-libtool" ++ $ECHO "*** objects $objs is not portable!" + libobjs="$libobjs $objs" + fi + fi + +- if test "$dlself" != no; then +- $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 +- fi ++ test "$dlself" != no && \ ++ func_warning "\`-dlopen self' is ignored for libtool libraries" + + set dummy $rpath +- if test "$#" -gt 2; then +- $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 +- fi +- install_libdir="$2" ++ shift ++ test "$#" -gt 1 && \ ++ func_warning "ignoring multiple \`-rpath's for a libtool library" ++ ++ install_libdir="$1" + + oldlibs= + if test -z "$rpath"; then +@@ -2862,35 +6159,31 @@ + build_old_libs=yes + fi + +- if test -n "$vinfo"; then +- $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 +- fi +- +- if test -n "$release"; then +- $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 +- fi ++ test -n "$vinfo" && \ ++ func_warning "\`-version-info/-version-number' is ignored for convenience libraries" ++ ++ test -n "$release" && \ ++ func_warning "\`-release' is ignored for convenience libraries" + else + + # Parse the version information argument. + save_ifs="$IFS"; IFS=':' + set dummy $vinfo 0 0 0 ++ shift + IFS="$save_ifs" + +- if test -n "$8"; then +- $echo "$modename: too many parameters to \`-version-info'" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- fi ++ test -n "$7" && \ ++ func_fatal_help "too many parameters to \`-version-info'" + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible +- ++ + case $vinfo_number in + yes) +- number_major="$2" +- number_minor="$3" +- number_revision="$4" ++ number_major="$1" ++ number_minor="$2" ++ number_revision="$3" + # + # There are really only two kinds -- those that + # use the current revision as the major version +@@ -2899,8 +6192,9 @@ + # which has an extra 1 added just for fun + # + case $version_type in +- darwin|linux|osf|windows) +- current=`expr $number_major + $number_minor` ++ darwin|linux|osf|windows|none) ++ func_arith $number_major + $number_minor ++ current=$func_arith_result + age="$number_minor" + revision="$number_revision" + ;; +@@ -2910,51 +6204,52 @@ + age="0" + ;; + irix|nonstopux) +- current=`expr $number_major + $number_minor - 1` ++ func_arith $number_major + $number_minor ++ current=$func_arith_result + age="$number_minor" + revision="$number_minor" ++ lt_irix_increment=no ++ ;; ++ *) ++ func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; + esac + ;; + no) +- current="$2" +- revision="$3" +- age="$4" ++ current="$1" ++ revision="$2" ++ age="$3" + ;; + esac + + # Check that each of the things are valid numbers. + case $current in +- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) +- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 +- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ func_error "CURRENT \`$current' must be a nonnegative integer" ++ func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + case $revision in +- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) +- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 +- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ func_error "REVISION \`$revision' must be a nonnegative integer" ++ func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + case $age in +- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) +- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 +- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ func_error "AGE \`$age' must be a nonnegative integer" ++ func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + if test "$age" -gt "$current"; then +- $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 +- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit 1 ++ func_error "AGE \`$age' is greater than the current interface number \`$current'" ++ func_fatal_error "\`$vinfo' is not valid version information" + fi + + # Calculate the version variables. +@@ -2967,10 +6262,13 @@ + darwin) + # Like Linux, but with the current version available in + # verstring for coding it into the library header +- major=.`expr $current - $age` ++ func_arith $current - $age ++ major=.$func_arith_result + versuffix="$major.$age.$revision" + # Darwin ld doesn't like 0 for these options... +- minor_current=`expr $current + 1` ++ func_arith $current + 1 ++ minor_current=$func_arith_result ++ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + +@@ -2981,11 +6279,16 @@ + + freebsd-elf) + major=".$current" +- versuffix=".$current"; ++ versuffix=".$current" + ;; + + irix | nonstopux) +- major=`expr $current - $age + 1` ++ if test "X$lt_irix_increment" = "Xno"; then ++ func_arith $current - $age ++ else ++ func_arith $current - $age + 1 ++ fi ++ major=$func_arith_result + + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; +@@ -2996,8 +6299,10 @@ + # Add in all the interfaces that we are compatible with. + loop=$revision + while test "$loop" -ne 0; do +- iface=`expr $revision - $loop` +- loop=`expr $loop - 1` ++ func_arith $revision - $loop ++ iface=$func_arith_result ++ func_arith $loop - 1 ++ loop=$func_arith_result + verstring="$verstring_prefix$major.$iface:$verstring" + done + +@@ -3007,20 +6312,24 @@ + ;; + + linux) +- major=.`expr $current - $age` ++ func_arith $current - $age ++ major=.$func_arith_result + versuffix="$major.$age.$revision" + ;; + + osf) +- major=.`expr $current - $age` ++ func_arith $current - $age ++ major=.$func_arith_result + versuffix=".$current.$age.$revision" + verstring="$current.$age.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$age + while test "$loop" -ne 0; do +- iface=`expr $current - $loop` +- loop=`expr $loop - 1` ++ func_arith $current - $loop ++ iface=$func_arith_result ++ func_arith $loop - 1 ++ loop=$func_arith_result + verstring="$verstring:${iface}.0" + done + +@@ -3028,6 +6337,11 @@ + verstring="$verstring:${current}.0" + ;; + ++ qnx) ++ major=".$current" ++ versuffix=".$current" ++ ;; ++ + sunos) + major=".$current" + versuffix=".$current.$revision" +@@ -3036,14 +6350,13 @@ + windows) + # Use '-' rather than '.', since we only want one + # extension on DOS 8.3 filesystems. +- major=`expr $current - $age` ++ func_arith $current - $age ++ major=$func_arith_result + versuffix="-$major" + ;; + + *) +- $echo "$modename: unknown library version type \`$version_type'" 1>&2 +- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 +- exit 1 ++ func_fatal_configuration "unknown library version type \`$version_type'" + ;; + esac + +@@ -3077,7 +6390,7 @@ + # Check to see if the archive will have undefined symbols. + if test "$allow_undefined" = yes; then + if test "$allow_undefined_flag" = unsupported; then +- $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 ++ func_warning "undefined symbols not allowed in $host shared libraries" + build_libtool_libs=no + build_old_libs=yes + fi +@@ -3085,31 +6398,36 @@ + # Don't allow undefined symbols. + allow_undefined_flag="$no_undefined_flag" + fi ++ + fi + ++ func_generate_dlsyms "$libname" "$libname" "yes" ++ libobjs="$libobjs $symfileobj" ++ test "X$libobjs" = "X " && libobjs= ++ + if test "$mode" != relink; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= +- tempremovelist=`$echo "$output_objdir/*"` ++ tempremovelist=`$ECHO "$output_objdir/*"` + for p in $tempremovelist; do + case $p in +- *.$objext) ++ *.$objext | *.gcno) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) +- if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 +- then +- continue ++ if test "X$precious_files_regex" != "X"; then ++ if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 ++ then ++ continue ++ fi + fi + removelist="$removelist $p" + ;; + *) ;; + esac + done +- if test -n "$removelist"; then +- $show "${rm}r $removelist" +- $run ${rm}r $removelist +- fi ++ test -n "$removelist" && \ ++ func_show_eval "${RM}r \$removelist" + fi + + # Now set the variables for building old libraries. +@@ -3117,15 +6435,15 @@ + oldlibs="$oldlibs $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. +- oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` ++ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` + fi + + # Eliminate all temporary directories. +- for path in $notinst_path; do +- lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` +- deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` +- dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` +- done ++ #for path in $notinst_path; do ++ # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` ++ # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` ++ # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` ++ #done + + if test -n "$xrpath"; then + # If the user specified any rpath flags, then add them. +@@ -3165,21 +6483,26 @@ + if test "$build_libtool_libs" = yes; then + if test -n "$rpath"; then + case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) + # these systems don't actually have a c library (as such)! + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework +- deplibs="$deplibs -framework System" ++ deplibs="$deplibs System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. +- test "X$arg" = "X-lc" && continue + ;; +- *) ++ *-*-sco3.2v5* | *-*-sco5v6*) ++ # Causes problems with __ctype ++ ;; ++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) ++ # Compiler inserts libc in the correct place for threads to work ++ ;; ++ *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then + deplibs="$deplibs -lc" +@@ -3216,18 +6539,18 @@ + # limits. Maybe even breaks it. We compile a program, linking it + # against the deplibs as a proxy for the library. Then we can check + # whether they linked in statically or dynamically with ldd. +- $rm conftest.c ++ $opt_dry_run || $RM conftest.c + cat > conftest.c </dev/null` + for potent_lib in $potential_libs; do + # Follow soft links. +- if ls -lLd "$potent_lib" 2>/dev/null \ +- | grep " -> " >/dev/null; then ++ if ls -lLd "$potent_lib" 2>/dev/null | ++ $GREP " -> " >/dev/null; then + continue + fi + # The statement above tries to avoid entering an +@@ -3345,12 +6672,12 @@ + potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + case $potliblink in + [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; +- *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; ++ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; + esac + done +- if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ +- | ${SED} 10q \ +- | $EGREP "$file_magic_regex" > /dev/null; then ++ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | ++ $SED -e 10q | ++ $EGREP "$file_magic_regex" > /dev/null; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 +@@ -3360,32 +6687,35 @@ + fi + if test -n "$a_deplib" ; then + droppeddeps=yes +- $echo +- $echo "*** Warning: linker path does not have real file for library $a_deplib." +- $echo "*** I have the capability to make that library automatically link in when" +- $echo "*** you link to this library. But I can only do this if you have a" +- $echo "*** shared version of the library, which you do not appear to have" +- $echo "*** because I did check the linker path looking for a file starting" ++ $ECHO ++ $ECHO "*** Warning: linker path does not have real file for library $a_deplib." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which you do not appear to have" ++ $ECHO "*** because I did check the linker path looking for a file starting" + if test -z "$potlib" ; then +- $echo "*** with $libname but no candidates were found. (...for file magic test)" ++ $ECHO "*** with $libname but no candidates were found. (...for file magic test)" + else +- $echo "*** with $libname and none of the candidates passed a file format test" +- $echo "*** using a file magic. Last file checked: $potlib" ++ $ECHO "*** with $libname and none of the candidates passed a file format test" ++ $ECHO "*** using a file magic. Last file checked: $potlib" + fi + fi +- else ++ ;; ++ *) + # Add a -L argument. + newdeplibs="$newdeplibs $a_deplib" +- fi ++ ;; ++ esac + done # Gone through all deplibs. + ;; + match_pattern*) +- set dummy $deplibs_check_method +- match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` ++ set dummy $deplibs_check_method; shift ++ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + for a_deplib in $deplibs; do +- name="`expr $a_deplib : '-l\(.*\)'`" +- # If $name is empty we are operating on a -L argument. +- if test -n "$name" && test "$name" != "0"; then ++ case $a_deplib in ++ -l*) ++ func_stripname -l '' "$a_deplib" ++ name=$func_stripname_result + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) +@@ -3395,14 +6725,13 @@ + esac + fi + if test -n "$a_deplib" ; then +- libname=`eval \\$echo \"$libname_spec\"` ++ libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib="$potent_lib" # see symlink-check above in file_magic test +- if eval $echo \"$potent_lib\" 2>/dev/null \ +- | ${SED} 10q \ +- | $EGREP "$match_pattern_regex" > /dev/null; then ++ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ ++ $EGREP "$match_pattern_regex" > /dev/null; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 +@@ -3412,44 +6741,46 @@ + fi + if test -n "$a_deplib" ; then + droppeddeps=yes +- $echo +- $echo "*** Warning: linker path does not have real file for library $a_deplib." +- $echo "*** I have the capability to make that library automatically link in when" +- $echo "*** you link to this library. But I can only do this if you have a" +- $echo "*** shared version of the library, which you do not appear to have" +- $echo "*** because I did check the linker path looking for a file starting" ++ $ECHO ++ $ECHO "*** Warning: linker path does not have real file for library $a_deplib." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which you do not appear to have" ++ $ECHO "*** because I did check the linker path looking for a file starting" + if test -z "$potlib" ; then +- $echo "*** with $libname but no candidates were found. (...for regex pattern test)" ++ $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" + else +- $echo "*** with $libname and none of the candidates passed a file format test" +- $echo "*** using a regex pattern. Last file checked: $potlib" ++ $ECHO "*** with $libname and none of the candidates passed a file format test" ++ $ECHO "*** using a regex pattern. Last file checked: $potlib" + fi + fi +- else ++ ;; ++ *) + # Add a -L argument. + newdeplibs="$newdeplibs $a_deplib" +- fi ++ ;; ++ esac + done # Gone through all deplibs. + ;; + none | unknown | *) + newdeplibs="" +- tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ +- -e 's/ -[LR][^ ]*//g'` ++ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ ++ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + for i in $predeps $postdeps ; do + # can't use Xsed below, because $i might contain '/' +- tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` ++ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` + done + fi +- if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ +- | grep . >/dev/null; then +- $echo ++ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | ++ $GREP . >/dev/null; then ++ $ECHO + if test "X$deplibs_check_method" = "Xnone"; then +- $echo "*** Warning: inter-library dependencies are not supported in this platform." ++ $ECHO "*** Warning: inter-library dependencies are not supported in this platform." + else +- $echo "*** Warning: inter-library dependencies are not known to be supported." ++ $ECHO "*** Warning: inter-library dependencies are not known to be supported." + fi +- $echo "*** All declared inter-library dependencies are being dropped." ++ $ECHO "*** All declared inter-library dependencies are being dropped." + droppeddeps=yes + fi + ;; +@@ -3462,24 +6793,24 @@ + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) +- # On Rhapsody replace the C library is the System framework +- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` ++ # On Rhapsody replace the C library with the System framework ++ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + ;; + esac + + if test "$droppeddeps" = yes; then + if test "$module" = yes; then +- $echo +- $echo "*** Warning: libtool could not satisfy all declared inter-library" +- $echo "*** dependencies of module $libname. Therefore, libtool will create" +- $echo "*** a static module, that should work as long as the dlopening" +- $echo "*** application is linked with the -dlopen flag." ++ $ECHO ++ $ECHO "*** Warning: libtool could not satisfy all declared inter-library" ++ $ECHO "*** dependencies of module $libname. Therefore, libtool will create" ++ $ECHO "*** a static module, that should work as long as the dlopening" ++ $ECHO "*** application is linked with the -dlopen flag." + if test -z "$global_symbol_pipe"; then +- $echo +- $echo "*** However, this would only work if libtool was able to extract symbol" +- $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" +- $echo "*** not find such a program. So, this module is probably useless." +- $echo "*** \`nm' from GNU binutils and a full rebuild may help." ++ $ECHO ++ $ECHO "*** However, this would only work if libtool was able to extract symbol" ++ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" ++ $ECHO "*** not find such a program. So, this module is probably useless." ++ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" +@@ -3489,16 +6820,16 @@ + build_libtool_libs=no + fi + else +- $echo "*** The inter-library dependencies that have been dropped here will be" +- $echo "*** automatically added whenever a program is linked with this library" +- $echo "*** or is declared to -dlopen it." ++ $ECHO "*** The inter-library dependencies that have been dropped here will be" ++ $ECHO "*** automatically added whenever a program is linked with this library" ++ $ECHO "*** or is declared to -dlopen it." + + if test "$allow_undefined" = no; then +- $echo +- $echo "*** Since this library must not contain undefined symbols," +- $echo "*** because either the platform does not support them or" +- $echo "*** it was explicitly requested with -no-undefined," +- $echo "*** libtool will only create a static version of it." ++ $ECHO ++ $ECHO "*** Since this library must not contain undefined symbols," ++ $ECHO "*** because either the platform does not support them or" ++ $ECHO "*** it was explicitly requested with -no-undefined," ++ $ECHO "*** libtool will only create a static version of it." + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module +@@ -3512,6 +6843,41 @@ + # Done checking deplibs! + deplibs=$newdeplibs + fi ++ # Time to change all our "foo.ltframework" stuff back to "-framework foo" ++ case $host in ++ *-*-darwin*) ++ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ ;; ++ esac ++ ++ # move library search paths that coincide with paths to not yet ++ # installed libraries to the beginning of the library search list ++ new_libs= ++ for path in $notinst_path; do ++ case " $new_libs " in ++ *" -L$path/$objdir "*) ;; ++ *) ++ case " $deplibs " in ++ *" -L$path/$objdir "*) ++ new_libs="$new_libs -L$path/$objdir" ;; ++ esac ++ ;; ++ esac ++ done ++ for deplib in $deplibs; do ++ case $deplib in ++ -L*) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ done ++ deplibs="$new_libs" + + # All the library-specific variables (install_libdir is set above). + library_names= +@@ -3580,11 +6946,12 @@ + fi + + # Get the real and link names of the library. +- eval shared_ext=\"$shrext\" ++ eval shared_ext=\"$shrext_cmds\" + eval library_names=\"$library_names_spec\" + set dummy $library_names +- realname="$2" +- shift; shift ++ shift ++ realname="$1" ++ shift + + if test -n "$soname_spec"; then + eval soname=\"$soname_spec\" +@@ -3596,125 +6963,126 @@ + fi + + lib="$output_objdir/$realname" ++ linknames= + for link + do + linknames="$linknames $link" + done + + # Use standard objects if they are pic +- test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ test "X$libobjs" = "X " && libobjs= ++ ++ delfiles= ++ if test -n "$export_symbols" && test -n "$include_expsyms"; then ++ $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" ++ export_symbols="$output_objdir/$libname.uexp" ++ delfiles="$delfiles $export_symbols" ++ fi ++ ++ orig_export_symbols= ++ case $host_os in ++ cygwin* | mingw* | cegcc*) ++ if test -n "$export_symbols" && test -z "$export_symbols_regex"; then ++ # exporting using user supplied symfile ++ if test "x`$SED 1q $export_symbols`" != xEXPORTS; then ++ # and it's NOT already a .def file. Must figure out ++ # which of the given symbols are data symbols and tag ++ # them as such. So, trigger use of export_symbols_cmds. ++ # export_symbols gets reassigned inside the "prepare ++ # the list of exported symbols" if statement, so the ++ # include_expsyms logic still works. ++ orig_export_symbols="$export_symbols" ++ export_symbols= ++ always_export_symbols=yes ++ fi ++ fi ++ ;; ++ esac + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then +- $show "generating symbol list for \`$libname.la'" ++ func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" +- $run $rm $export_symbols ++ $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + eval cmd=\"$cmd\" +- if len=`expr "X$cmd" : ".*"` && +- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then +- $show "$cmd" +- $run eval "$cmd" || exit $? +- skipped_export=false ++ func_len " $cmd" ++ len=$func_len_result ++ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ func_show_eval "$cmd" 'exit $?' ++ skipped_export=false + else +- # The command line is too long to execute in one step. +- $show "using reloadable object file for export list..." +- skipped_export=: ++ # The command line is too long to execute in one step. ++ func_verbose "using reloadable object file for export list..." ++ skipped_export=: ++ # Break out early, otherwise skipped_export may be ++ # set to false by a later but shorter cmd. ++ break + fi + done + IFS="$save_ifs" +- if test -n "$export_symbols_regex"; then +- $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" +- $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' +- $show "$mv \"${export_symbols}T\" \"$export_symbols\"" +- $run eval '$mv "${export_symbols}T" "$export_symbols"' ++ if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then ++ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' ++ func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi + fi + + if test -n "$export_symbols" && test -n "$include_expsyms"; then +- $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' ++ tmp_export_symbols="$export_symbols" ++ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" ++ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' ++ fi ++ ++ if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then ++ # The given exports_symbols file has to be filtered, so filter it. ++ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" ++ # FIXME: $output_objdir/$libname.filter potentially contains lots of ++ # 's' commands which not all seds can handle. GNU sed should be fine ++ # though. Also, the filter scales superlinearly with the number of ++ # global variables. join(1) would be nice here, but unfortunately ++ # isn't a blessed tool. ++ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter ++ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ export_symbols=$output_objdir/$libname.def ++ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + + tmp_deplibs= + for test_deplib in $deplibs; do +- case " $convenience " in +- *" $test_deplib "*) ;; +- *) +- tmp_deplibs="$tmp_deplibs $test_deplib" +- ;; +- esac ++ case " $convenience " in ++ *" $test_deplib "*) ;; ++ *) ++ tmp_deplibs="$tmp_deplibs $test_deplib" ++ ;; ++ esac + done +- deplibs="$tmp_deplibs" ++ deplibs="$tmp_deplibs" + + if test -n "$convenience"; then ++ if test -n "$whole_archive_flag_spec" && ++ test "$compiler_needs_object" = yes && ++ test -z "$libobjs"; then ++ # extract the archives, so we have objects to list. ++ # TODO: could optimize this to just extract one archive. ++ whole_archive_flag_spec= ++ fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" ++ test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" +- $show "${rm}r $gentop" +- $run ${rm}r "$gentop" +- $show "$mkdir $gentop" +- $run $mkdir "$gentop" +- status=$? +- if test "$status" -ne 0 && test ! -d "$gentop"; then +- exit $status +- fi + generated="$generated $gentop" + +- for xlib in $convenience; do +- # Extract the objects. +- case $xlib in +- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; +- *) xabs=`pwd`"/$xlib" ;; +- esac +- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` +- xdir="$gentop/$xlib" +- +- $show "${rm}r $xdir" +- $run ${rm}r "$xdir" +- $show "$mkdir $xdir" +- $run $mkdir "$xdir" +- status=$? +- if test "$status" -ne 0 && test ! -d "$xdir"; then +- exit $status +- fi +- # We will extract separately just the conflicting names and we will no +- # longer touch any unique names. It is faster to leave these extract +- # automatically by $AR in one run. +- $show "(cd $xdir && $AR x $xabs)" +- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? +- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then +- : +- else +- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 +- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 +- $AR t "$xabs" | sort | uniq -cd | while read -r count name +- do +- i=1 +- while test "$i" -le "$count" +- do +- # Put our $i before any first dot (extension) +- # Never overwrite any file +- name_to="$name" +- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" +- do +- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` +- done +- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" +- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? +- i=`expr $i + 1` +- done +- done +- fi +- +- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` +- done ++ func_extract_archives $gentop $convenience ++ libobjs="$libobjs $func_extract_archives_result" ++ test "X$libobjs" = "X " && libobjs= + fi + fi + +@@ -3725,7 +7093,7 @@ + + # Make a backup of the uninstalled library when relinking + if test "$mode" = relink; then +- $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi + + # Do each of the archive commands. +@@ -3738,21 +7106,24 @@ + cmds=$module_cmds + fi + else +- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval test_cmds=\"$archive_expsym_cmds\" +- cmds=$archive_expsym_cmds +- else +- eval test_cmds=\"$archive_cmds\" +- cmds=$archive_cmds ++ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then ++ eval test_cmds=\"$archive_expsym_cmds\" ++ cmds=$archive_expsym_cmds ++ else ++ eval test_cmds=\"$archive_cmds\" ++ cmds=$archive_cmds + fi + fi + +- if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && +- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ if test "X$skipped_export" != "X:" && ++ func_len " $test_cmds" && ++ len=$func_len_result && ++ test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else +- # The command line is too long to link in one step, link piecewise. +- $echo "creating reloadable object files..." ++ # The command line is too long to link in one step, link piecewise ++ # or, if using GNU ld and skipped_export is not :, use a linker ++ # script. + + # Save the value of $output and $libobjs because we want to + # use them later. If we have whole_archive_flag_spec, we +@@ -3766,77 +7137,162 @@ + save_libobjs=$libobjs + fi + save_output=$output ++ output_la=`$ECHO "X$output" | $Xsed -e "$basename"` + + # Clear the reloadable object creation command queue and + # initialize k to one. + test_cmds= + concat_cmds= + objlist= +- delfiles= + last_robj= + k=1 +- output=$output_objdir/$save_output-${k}.$objext +- # Loop over the list of objects to be linked. +- for obj in $save_libobjs +- do +- eval test_cmds=\"$reload_cmds $objlist $last_robj\" +- if test "X$objlist" = X || +- { len=`expr "X$test_cmds" : ".*"` && +- test "$len" -le "$max_cmd_len"; }; then +- objlist="$objlist $obj" ++ ++ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then ++ output=${output_objdir}/${output_la}.lnkscript ++ func_verbose "creating GNU ld script: $output" ++ $ECHO 'INPUT (' > $output ++ for obj in $save_libobjs ++ do ++ $ECHO "$obj" >> $output ++ done ++ $ECHO ')' >> $output ++ delfiles="$delfiles $output" ++ elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then ++ output=${output_objdir}/${output_la}.lnk ++ func_verbose "creating linker input file list: $output" ++ : > $output ++ set x $save_libobjs ++ shift ++ firstobj= ++ if test "$compiler_needs_object" = yes; then ++ firstobj="$1 " ++ shift ++ fi ++ for obj ++ do ++ $ECHO "$obj" >> $output ++ done ++ delfiles="$delfiles $output" ++ output=$firstobj\"$file_list_spec$output\" ++ else ++ if test -n "$save_libobjs"; then ++ func_verbose "creating reloadable object files..." ++ output=$output_objdir/$output_la-${k}.$objext ++ eval test_cmds=\"$reload_cmds\" ++ func_len " $test_cmds" ++ len0=$func_len_result ++ len=$len0 ++ ++ # Loop over the list of objects to be linked. ++ for obj in $save_libobjs ++ do ++ func_len " $obj" ++ func_arith $len + $func_len_result ++ len=$func_arith_result ++ if test "X$objlist" = X || ++ test "$len" -lt "$max_cmd_len"; then ++ func_append objlist " $obj" ++ else ++ # The command $test_cmds is almost too long, add a ++ # command to the queue. ++ if test "$k" -eq 1 ; then ++ # The first file doesn't have a previous command to add. ++ eval concat_cmds=\"$reload_cmds $objlist $last_robj\" ++ else ++ # All subsequent reloadable object files will link in ++ # the last one created. ++ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" ++ fi ++ last_robj=$output_objdir/$output_la-${k}.$objext ++ func_arith $k + 1 ++ k=$func_arith_result ++ output=$output_objdir/$output_la-${k}.$objext ++ objlist=$obj ++ func_len " $last_robj" ++ func_arith $len0 + $func_len_result ++ len=$func_arith_result ++ fi ++ done ++ # Handle the remaining objects by creating one last ++ # reloadable object file. All subsequent reloadable object ++ # files will link in the last one created. ++ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ ++ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" ++ if test -n "$last_robj"; then ++ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" ++ fi ++ delfiles="$delfiles $output" ++ + else +- # The command $test_cmds is almost too long, add a +- # command to the queue. +- if test "$k" -eq 1 ; then +- # The first file doesn't have a previous command to add. +- eval concat_cmds=\"$reload_cmds $objlist $last_robj\" +- else +- # All subsequent reloadable object files will link in +- # the last one created. +- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" ++ output= ++ fi ++ ++ if ${skipped_export-false}; then ++ func_verbose "generating symbol list for \`$libname.la'" ++ export_symbols="$output_objdir/$libname.exp" ++ $opt_dry_run || $RM $export_symbols ++ libobjs=$output ++ # Append the command to create the export file. ++ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ ++ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" ++ if test -n "$last_robj"; then ++ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi +- last_robj=$output_objdir/$save_output-${k}.$objext +- k=`expr $k + 1` +- output=$output_objdir/$save_output-${k}.$objext +- objlist=$obj +- len=1 + fi +- done +- # Handle the remaining objects by creating one last +- # reloadable object file. All subsequent reloadable object +- # files will link in the last one created. +- test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" +- +- if ${skipped_export-false}; then +- $show "generating symbol list for \`$libname.la'" +- export_symbols="$output_objdir/$libname.exp" +- $run $rm $export_symbols +- libobjs=$output +- # Append the command to create the export file. +- eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" +- fi +- +- # Set up a command to remove the reloadale object files +- # after they are used. +- i=0 +- while test "$i" -lt "$k" +- do +- i=`expr $i + 1` +- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" +- done +- +- $echo "creating a temporary reloadable object file: $output" +- +- # Loop through the commands generated above and execute them. +- save_ifs="$IFS"; IFS='~' +- for cmd in $concat_cmds; do ++ ++ test -n "$save_libobjs" && ++ func_verbose "creating a temporary reloadable object file: $output" ++ ++ # Loop through the commands generated above and execute them. ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $concat_cmds; do ++ IFS="$save_ifs" ++ $opt_silent || { ++ func_quote_for_expand "$cmd" ++ eval "func_echo $func_quote_for_expand_result" ++ } ++ $opt_dry_run || eval "$cmd" || { ++ lt_exit=$? ++ ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ ( cd "$output_objdir" && \ ++ $RM "${realname}T" && \ ++ $MV "${realname}U" "$realname" ) ++ fi ++ ++ exit $lt_exit ++ } ++ done + IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" ++ ++ if test -n "$export_symbols_regex" && ${skipped_export-false}; then ++ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' ++ func_show_eval '$MV "${export_symbols}T" "$export_symbols"' ++ fi ++ fi ++ ++ if ${skipped_export-false}; then ++ if test -n "$export_symbols" && test -n "$include_expsyms"; then ++ tmp_export_symbols="$export_symbols" ++ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" ++ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' ++ fi ++ ++ if test -n "$orig_export_symbols"; then ++ # The given exports_symbols file has to be filtered, so filter it. ++ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" ++ # FIXME: $output_objdir/$libname.filter potentially contains lots of ++ # 's' commands which not all seds can handle. GNU sed should be fine ++ # though. Also, the filter scales superlinearly with the number of ++ # global variables. join(1) would be nice here, but unfortunately ++ # isn't a blessed tool. ++ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter ++ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ export_symbols=$output_objdir/$libname.def ++ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols ++ fi ++ fi + + libobjs=$output + # Restore the value of output. +@@ -3844,6 +7300,7 @@ + + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" ++ test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the + # value of $libobjs for piecewise linking. +@@ -3856,37 +7313,69 @@ + cmds=$module_cmds + fi + else +- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- cmds=$archive_expsym_cmds +- else +- cmds=$archive_cmds ++ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then ++ cmds=$archive_expsym_cmds ++ else ++ cmds=$archive_cmds + fi + fi +- +- # Append the command to remove the reloadable object files +- # to the just-reset $cmds. +- eval cmds=\"\$cmds~\$rm $delfiles\" + fi ++ ++ if test -n "$delfiles"; then ++ # Append the command to remove temporary files to $cmds. ++ eval cmds=\"\$cmds~\$RM $delfiles\" ++ fi ++ ++ # Add any objects from preloaded convenience libraries ++ if test -n "$dlprefiles"; then ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" ++ ++ func_extract_archives $gentop $dlprefiles ++ libobjs="$libobjs $func_extract_archives_result" ++ test "X$libobjs" = "X " && libobjs= ++ fi ++ + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || exit $? ++ $opt_silent || { ++ func_quote_for_expand "$cmd" ++ eval "func_echo $func_quote_for_expand_result" ++ } ++ $opt_dry_run || eval "$cmd" || { ++ lt_exit=$? ++ ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ ( cd "$output_objdir" && \ ++ $RM "${realname}T" && \ ++ $MV "${realname}U" "$realname" ) ++ fi ++ ++ exit $lt_exit ++ } + done + IFS="$save_ifs" + + # Restore the uninstalled library and exit + if test "$mode" = relink; then +- $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? +- exit 0 ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? ++ ++ if test -n "$convenience"; then ++ if test -z "$whole_archive_flag_spec"; then ++ func_show_eval '${RM}r "$gentop"' ++ fi ++ fi ++ ++ exit $EXIT_SUCCESS + fi + + # Create links to the real library. + for linkname in $linknames; do + if test "$realname" != "$linkname"; then +- $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" +- $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? ++ func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' + fi + done + +@@ -3899,38 +7388,35 @@ + ;; + + obj) +- if test -n "$deplibs"; then +- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then ++ func_warning "\`-dlopen' is ignored for objects" + fi + +- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then +- $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 +- fi +- +- if test -n "$rpath"; then +- $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 +- fi +- +- if test -n "$xrpath"; then +- $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 +- fi +- +- if test -n "$vinfo"; then +- $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 +- fi +- +- if test -n "$release"; then +- $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 +- fi ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ func_warning "\`-l' and \`-L' are ignored for objects" ;; ++ esac ++ ++ test -n "$rpath" && \ ++ func_warning "\`-rpath' is ignored for objects" ++ ++ test -n "$xrpath" && \ ++ func_warning "\`-R' is ignored for objects" ++ ++ test -n "$vinfo" && \ ++ func_warning "\`-version-info' is ignored for objects" ++ ++ test -n "$release" && \ ++ func_warning "\`-release' is ignored for objects" + + case $output in + *.lo) +- if test -n "$objs$old_deplibs"; then +- $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 +- exit 1 +- fi +- libobj="$output" +- obj=`$echo "X$output" | $Xsed -e "$lo2o"` ++ test -n "$objs$old_deplibs" && \ ++ func_fatal_error "cannot build library object \`$output' from non-libtool objects" ++ ++ libobj=$output ++ func_lo2o "$libobj" ++ obj=$func_lo2o_result + ;; + *) + libobj= +@@ -3939,7 +7425,7 @@ + esac + + # Delete the old objects. +- $run $rm $obj $libobj ++ $opt_dry_run || $RM $obj $libobj + + # Objects from convenience libraries. This assumes + # single-version convenience libraries. Whenever we create +@@ -3948,172 +7434,136 @@ + reload_conv_objs= + gentop= + # reload_cmds runs $LD directly, so let us get rid of +- # -Wl from whole_archive_flag_spec ++ # -Wl from whole_archive_flag_spec and hope we can get by with ++ # turning comma into space.. + wl= + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then +- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" ++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" ++ reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + else + gentop="$output_objdir/${obj}x" +- $show "${rm}r $gentop" +- $run ${rm}r "$gentop" +- $show "$mkdir $gentop" +- $run $mkdir "$gentop" +- status=$? +- if test "$status" -ne 0 && test ! -d "$gentop"; then +- exit $status +- fi + generated="$generated $gentop" + +- for xlib in $convenience; do +- # Extract the objects. +- case $xlib in +- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; +- *) xabs=`pwd`"/$xlib" ;; +- esac +- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` +- xdir="$gentop/$xlib" +- +- $show "${rm}r $xdir" +- $run ${rm}r "$xdir" +- $show "$mkdir $xdir" +- $run $mkdir "$xdir" +- status=$? +- if test "$status" -ne 0 && test ! -d "$xdir"; then +- exit $status +- fi +- # We will extract separately just the conflicting names and we will no +- # longer touch any unique names. It is faster to leave these extract +- # automatically by $AR in one run. +- $show "(cd $xdir && $AR x $xabs)" +- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? +- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then +- : +- else +- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 +- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 +- $AR t "$xabs" | sort | uniq -cd | while read -r count name +- do +- i=1 +- while test "$i" -le "$count" +- do +- # Put our $i before any first dot (extension) +- # Never overwrite any file +- name_to="$name" +- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" +- do +- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` +- done +- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" +- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? +- i=`expr $i + 1` +- done +- done +- fi +- +- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` +- done ++ func_extract_archives $gentop $convenience ++ reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + + # Create the old-style object. +- reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test ++ reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + + output="$obj" +- cmds=$reload_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" ++ func_execute_cmds "$reload_cmds" 'exit $?' + + # Exit if we aren't doing a library object file. + if test -z "$libobj"; then + if test -n "$gentop"; then +- $show "${rm}r $gentop" +- $run ${rm}r $gentop ++ func_show_eval '${RM}r "$gentop"' + fi + +- exit 0 ++ exit $EXIT_SUCCESS + fi + + if test "$build_libtool_libs" != yes; then + if test -n "$gentop"; then +- $show "${rm}r $gentop" +- $run ${rm}r $gentop ++ func_show_eval '${RM}r "$gentop"' + fi + + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" +- # $run eval "echo timestamp > $libobj" || exit $? +- exit 0 ++ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? ++ exit $EXIT_SUCCESS + fi + + if test -n "$pic_flag" || test "$pic_mode" != default; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" + output="$libobj" +- cmds=$reload_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" ++ func_execute_cmds "$reload_cmds" 'exit $?' + fi + + if test -n "$gentop"; then +- $show "${rm}r $gentop" +- $run ${rm}r $gentop ++ func_show_eval '${RM}r "$gentop"' + fi + +- exit 0 ++ exit $EXIT_SUCCESS + ;; + + prog) + case $host in +- *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; ++ *cygwin*) func_stripname '' '.exe' "$output" ++ output=$func_stripname_result.exe;; + esac +- if test -n "$vinfo"; then +- $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 +- fi +- +- if test -n "$release"; then +- $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 +- fi +- +- if test "$preload" = yes; then +- if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && +- test "$dlopen_self_static" = unknown; then +- $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." +- fi +- fi ++ test -n "$vinfo" && \ ++ func_warning "\`-version-info' is ignored for programs" ++ ++ test -n "$release" && \ ++ func_warning "\`-release' is ignored for programs" ++ ++ test "$preload" = yes \ ++ && test "$dlopen_support" = unknown \ ++ && test "$dlopen_self" = unknown \ ++ && test "$dlopen_self_static" = unknown && \ ++ func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework +- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` +- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` ++ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ++ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + ;; + esac + + case $host in +- *darwin*) +- # Don't allow lazy linking, it breaks C++ global constructors +- if test "$tagname" = CXX ; then +- compile_command="$compile_command ${wl}-bind_at_load" +- finalize_command="$finalize_command ${wl}-bind_at_load" +- fi +- ;; ++ *-*-darwin*) ++ # Don't allow lazy linking, it breaks C++ global constructors ++ # But is supposedly fixed on 10.4 or later (yay!). ++ if test "$tagname" = CXX ; then ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0} in ++ 10.[0123]) ++ compile_command="$compile_command ${wl}-bind_at_load" ++ finalize_command="$finalize_command ${wl}-bind_at_load" ++ ;; ++ esac ++ fi ++ # Time to change all our "foo.ltframework" stuff back to "-framework foo" ++ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ ;; + esac + ++ ++ # move library search paths that coincide with paths to not yet ++ # installed libraries to the beginning of the library search list ++ new_libs= ++ for path in $notinst_path; do ++ case " $new_libs " in ++ *" -L$path/$objdir "*) ;; ++ *) ++ case " $compile_deplibs " in ++ *" -L$path/$objdir "*) ++ new_libs="$new_libs -L$path/$objdir" ;; ++ esac ++ ;; ++ esac ++ done ++ for deplib in $compile_deplibs; do ++ case $deplib in ++ -L*) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ done ++ compile_deplibs="$new_libs" ++ ++ + compile_command="$compile_command $compile_deplibs" + finalize_command="$finalize_command $finalize_deplibs" + +@@ -4157,11 +7607,18 @@ + esac + fi + case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) ++ testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; ++ ::) dllsearchpath=$libdir;; + *) dllsearchpath="$dllsearchpath:$libdir";; + esac ++ case :$dllsearchpath: in ++ *":$testbindir:"*) ;; ++ ::) dllsearchpath=$testbindir;; ++ *) dllsearchpath="$dllsearchpath:$testbindir";; ++ esac + ;; + esac + done +@@ -4211,235 +7668,49 @@ + + if test -n "$libobjs" && test "$build_old_libs" = yes; then + # Transform all the library objects into standard objects. +- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` +- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + fi + +- dlsyms= +- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then +- if test -n "$NM" && test -n "$global_symbol_pipe"; then +- dlsyms="${outputname}S.c" +- else +- $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 ++ func_generate_dlsyms "$outputname" "@PROGRAM@" "no" ++ ++ # template prelinking step ++ if test -n "$prelink_cmds"; then ++ func_execute_cmds "$prelink_cmds" 'exit $?' ++ fi ++ ++ wrappers_required=yes ++ case $host in ++ *cygwin* | *mingw* ) ++ if test "$build_libtool_libs" != yes; then ++ wrappers_required=no ++ fi ++ ;; ++ *cegcc) ++ # Disable wrappers for cegcc, we are cross compiling anyway. ++ wrappers_required=no ++ ;; ++ *) ++ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then ++ wrappers_required=no ++ fi ++ ;; ++ esac ++ if test "$wrappers_required" = no; then ++ # Replace the output file specification. ++ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` ++ link_command="$compile_command$compile_rpath" ++ ++ # We have no uninstalled library dependencies, so finalize right now. ++ exit_status=0 ++ func_show_eval "$link_command" 'exit_status=$?' ++ ++ # Delete the generated files. ++ if test -f "$output_objdir/${outputname}S.${objext}"; then ++ func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + fi +- fi +- +- if test -n "$dlsyms"; then +- case $dlsyms in +- "") ;; +- *.c) +- # Discover the nlist of each of the dlfiles. +- nlist="$output_objdir/${outputname}.nm" +- +- $show "$rm $nlist ${nlist}S ${nlist}T" +- $run $rm "$nlist" "${nlist}S" "${nlist}T" +- +- # Parse the name list into a source file. +- $show "creating $output_objdir/$dlsyms" +- +- test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ +-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ +-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ +- +-#ifdef __cplusplus +-extern \"C\" { +-#endif +- +-/* Prevent the only kind of declaration conflicts we can make. */ +-#define lt_preloaded_symbols some_other_symbol +- +-/* External symbol declarations for the compiler. */\ +-" +- +- if test "$dlself" = yes; then +- $show "generating symbol list for \`$output'" +- +- test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" +- +- # Add our own program objects to the symbol list. +- progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` +- for arg in $progfiles; do +- $show "extracting global C symbols from \`$arg'" +- $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" +- done +- +- if test -n "$exclude_expsyms"; then +- $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' +- $run eval '$mv "$nlist"T "$nlist"' +- fi +- +- if test -n "$export_symbols_regex"; then +- $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' +- $run eval '$mv "$nlist"T "$nlist"' +- fi +- +- # Prepare the list of exported symbols +- if test -z "$export_symbols"; then +- export_symbols="$output_objdir/$output.exp" +- $run $rm $export_symbols +- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' +- else +- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' +- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' +- $run eval 'mv "$nlist"T "$nlist"' +- fi +- fi +- +- for arg in $dlprefiles; do +- $show "extracting global C symbols from \`$arg'" +- name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` +- $run eval '$echo ": $name " >> "$nlist"' +- $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" +- done +- +- if test -z "$run"; then +- # Make sure we have at least an empty file. +- test -f "$nlist" || : > "$nlist" +- +- if test -n "$exclude_expsyms"; then +- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T +- $mv "$nlist"T "$nlist" +- fi +- +- # Try sorting and uniquifying the output. +- if grep -v "^: " < "$nlist" | +- if sort -k 3 /dev/null 2>&1; then +- sort -k 3 +- else +- sort +2 +- fi | +- uniq > "$nlist"S; then +- : +- else +- grep -v "^: " < "$nlist" > "$nlist"S +- fi +- +- if test -f "$nlist"S; then +- eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' +- else +- $echo '/* NONE */' >> "$output_objdir/$dlsyms" +- fi +- +- $echo >> "$output_objdir/$dlsyms" "\ +- +-#undef lt_preloaded_symbols +- +-#if defined (__STDC__) && __STDC__ +-# define lt_ptr void * +-#else +-# define lt_ptr char * +-# define const +-#endif +- +-/* The mapping between symbol names and symbols. */ +-const struct { +- const char *name; +- lt_ptr address; +-} +-lt_preloaded_symbols[] = +-{\ +-" +- +- eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" +- +- $echo >> "$output_objdir/$dlsyms" "\ +- {0, (lt_ptr) 0} +-}; +- +-/* This works around a problem in FreeBSD linker */ +-#ifdef FREEBSD_WORKAROUND +-static const void *lt_preloaded_setup() { +- return lt_preloaded_symbols; +-} +-#endif +- +-#ifdef __cplusplus +-} +-#endif\ +-" +- fi +- +- pic_flag_for_symtable= +- case $host in +- # compiling the symbol table file with pic_flag works around +- # a FreeBSD bug that causes programs to crash when -lm is +- # linked before any other PIC object. But we must not use +- # pic_flag when linking with -static. The problem exists in +- # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. +- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) +- case "$compile_command " in +- *" -static "*) ;; +- *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; +- esac;; +- *-*-hpux*) +- case "$compile_command " in +- *" -static "*) ;; +- *) pic_flag_for_symtable=" $pic_flag";; +- esac +- esac +- +- # Now compile the dynamic symbol file. +- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" +- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? +- +- # Clean up the generated files. +- $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" +- $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" +- +- # Transform the symbol file into the correct name. +- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` +- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` +- ;; +- *) +- $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 +- exit 1 +- ;; +- esac +- else +- # We keep going just in case the user didn't refer to +- # lt_preloaded_symbols. The linker will fail if global_symbol_pipe +- # really was required. +- +- # Nullify the symbol file. +- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` +- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` +- fi +- +- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then +- # Replace the output file specification. +- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` +- link_command="$compile_command$compile_rpath" +- +- # We have no uninstalled library dependencies, so finalize right now. +- $show "$link_command" +- $run eval "$link_command" +- status=$? +- +- # Delete the generated files. +- if test -n "$dlsyms"; then +- $show "$rm $output_objdir/${outputname}S.${objext}" +- $run $rm "$output_objdir/${outputname}S.${objext}" +- fi +- +- exit $status +- fi +- +- if test -n "$shlibpath_var"; then +- # We should set the shlibpath_var +- rpath= +- for dir in $temp_rpath; do +- case $dir in +- [\\/]* | [A-Za-z]:[\\/]*) +- # Absolute path. +- rpath="$rpath$dir:" +- ;; +- *) +- # Relative path: add a thisdir entry. +- rpath="$rpath\$thisdir/$dir:" +- ;; +- esac +- done +- temp_rpath="$rpath" ++ ++ exit $exit_status + fi + + if test -n "$compile_shlibpath$finalize_shlibpath"; then +@@ -4474,13 +7745,12 @@ + # We don't need to create a wrapper script. + link_command="$compile_var$compile_command$compile_rpath" + # Replace the output file specification. +- link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` ++ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + # Delete the old output file. +- $run $rm $output ++ $opt_dry_run || $RM $output + # Link the executable and exit +- $show "$link_command" +- $run eval "$link_command" || exit $? +- exit 0 ++ func_show_eval "$link_command" 'exit $?' ++ exit $EXIT_SUCCESS + fi + + if test "$hardcode_action" = relink; then +@@ -4488,13 +7758,13 @@ + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" + +- $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 +- $echo "$modename: \`$output' will be relinked during installation" 1>&2 ++ func_warning "this platform does not like uninstalled shared libraries" ++ func_warning "\`$output' will be relinked during installation" + else + if test "$fast_install" != no; then + link_command="$finalize_var$compile_command$finalize_rpath" + if test "$fast_install" = yes; then +- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` ++ relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + else + # fast_install is set to needless + relink_command= +@@ -4506,449 +7776,104 @@ + fi + + # Replace the output file specification. +- link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` ++ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + + # Delete the old output files. +- $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname +- +- $show "$link_command" +- $run eval "$link_command" || exit $? ++ $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname ++ ++ func_show_eval "$link_command" 'exit $?' + + # Now create the wrapper script. +- $show "creating $output" ++ func_verbose "creating $output" + + # Quote the relink command for shipping. + if test -n "$relink_command"; then + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then +- relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" ++ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else +- var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` +- relink_command="$var=\"$var_value\"; export $var; $relink_command" ++ func_quote_for_eval "$var_value" ++ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi + done + relink_command="(cd `pwd`; $relink_command)" +- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` ++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + fi + +- # Quote $echo for shipping. +- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then +- case $0 in +- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; +- *) qecho="$SHELL `pwd`/$0 --fallback-echo";; ++ # Quote $ECHO for shipping. ++ if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then ++ case $progpath in ++ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; ++ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; + esac +- qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` ++ qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` + else +- qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` ++ qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` + fi + +- # Only actually do things if our run command is non-null. +- if test -z "$run"; then ++ # Only actually do things if not in dry run mode. ++ $opt_dry_run || { + # win32 will think the script is a binary if it has + # a .exe suffix, so we strip it off here. + case $output in +- *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; ++ *.exe) func_stripname '' '.exe' "$output" ++ output=$func_stripname_result ;; + esac + # test for cygwin because mv fails w/o .exe extensions + case $host in + *cygwin*) + exeext=.exe +- outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; ++ func_stripname '' '.exe' "$outputname" ++ outputname=$func_stripname_result ;; + *) exeext= ;; + esac + case $host in + *cygwin* | *mingw* ) +- cwrappersource=`$echo ${objdir}/lt-${output}.c` +- cwrapper=`$echo ${output}.exe` +- $rm $cwrappersource $cwrapper +- trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15 +- +- cat > $cwrappersource <> $cwrappersource<<"EOF" +-#include +-#include +-#include +-#include +-#include +-#include +- +-#if defined(PATH_MAX) +-# define LT_PATHMAX PATH_MAX +-#elif defined(MAXPATHLEN) +-# define LT_PATHMAX MAXPATHLEN +-#else +-# define LT_PATHMAX 1024 +-#endif +- +-#ifndef DIR_SEPARATOR +-#define DIR_SEPARATOR '/' +-#endif +- +-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ +- defined (__OS2__) +-#define HAVE_DOS_BASED_FILE_SYSTEM +-#ifndef DIR_SEPARATOR_2 +-#define DIR_SEPARATOR_2 '\\' +-#endif +-#endif +- +-#ifndef DIR_SEPARATOR_2 +-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +-#else /* DIR_SEPARATOR_2 */ +-# define IS_DIR_SEPARATOR(ch) \ +- (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +-#endif /* DIR_SEPARATOR_2 */ +- +-#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +-#define XFREE(stale) do { \ +- if (stale) { free ((void *) stale); stale = 0; } \ +-} while (0) +- +-const char *program_name = NULL; +- +-void * xmalloc (size_t num); +-char * xstrdup (const char *string); +-char * basename (const char *name); +-char * fnqualify(const char *path); +-char * strendzap(char *str, const char *pat); +-void lt_fatal (const char *message, ...); +- +-int +-main (int argc, char *argv[]) +-{ +- char **newargz; +- int i; +- +- program_name = (char *) xstrdup ((char *) basename (argv[0])); +- newargz = XMALLOC(char *, argc+2); +-EOF +- +- cat >> $cwrappersource <> $cwrappersource <<"EOF" +- newargz[1] = fnqualify(argv[0]); +- /* we know the script has the same name, without the .exe */ +- /* so make sure newargz[1] doesn't end in .exe */ +- strendzap(newargz[1],".exe"); +- for (i = 1; i < argc; i++) +- newargz[i+1] = xstrdup(argv[i]); +- newargz[argc+1] = NULL; +-EOF +- +- cat >> $cwrappersource <> $cwrappersource <<"EOF" +-} +- +-void * +-xmalloc (size_t num) +-{ +- void * p = (void *) malloc (num); +- if (!p) +- lt_fatal ("Memory exhausted"); +- +- return p; +-} +- +-char * +-xstrdup (const char *string) +-{ +- return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL +-; +-} +- +-char * +-basename (const char *name) +-{ +- const char *base; +- +-#if defined (HAVE_DOS_BASED_FILE_SYSTEM) +- /* Skip over the disk name in MSDOS pathnames. */ +- if (isalpha (name[0]) && name[1] == ':') +- name += 2; +-#endif +- +- for (base = name; *name; name++) +- if (IS_DIR_SEPARATOR (*name)) +- base = name + 1; +- return (char *) base; +-} +- +-char * +-fnqualify(const char *path) +-{ +- size_t size; +- char *p; +- char tmp[LT_PATHMAX + 1]; +- +- assert(path != NULL); +- +- /* Is it qualified already? */ +-#if defined (HAVE_DOS_BASED_FILE_SYSTEM) +- if (isalpha (path[0]) && path[1] == ':') +- return xstrdup (path); +-#endif +- if (IS_DIR_SEPARATOR (path[0])) +- return xstrdup (path); +- +- /* prepend the current directory */ +- /* doesn't handle '~' */ +- if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); +- size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ +- p = XMALLOC(char, size); +- sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); +- return p; +-} +- +-char * +-strendzap(char *str, const char *pat) +-{ +- size_t len, patlen; +- +- assert(str != NULL); +- assert(pat != NULL); +- +- len = strlen(str); +- patlen = strlen(pat); +- +- if (patlen <= len) +- { +- str += len - patlen; +- if (strcmp(str, pat) == 0) +- *str = '\0'; +- } +- return str; +-} +- +-static void +-lt_error_core (int exit_status, const char * mode, +- const char * message, va_list ap) +-{ +- fprintf (stderr, "%s: %s: ", program_name, mode); +- vfprintf (stderr, message, ap); +- fprintf (stderr, ".\n"); +- +- if (exit_status >= 0) +- exit (exit_status); +-} +- +-void +-lt_fatal (const char *message, ...) +-{ +- va_list ap; +- va_start (ap, message); +- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); +- va_end (ap); +-} +-EOF +- # we should really use a build-platform specific compiler +- # here, but OTOH, the wrappers (shell script and this C one) +- # are only useful if you want to execute the "real" binary. +- # Since the "real" binary is built for $host, then this +- # wrapper might as well be built for $host, too. +- $run $LTCC -s -o $cwrapper $cwrappersource ++ func_dirname_and_basename "$output" "" "." ++ output_name=$func_basename_result ++ output_path=$func_dirname_result ++ cwrappersource="$output_path/$objdir/lt-$output_name.c" ++ cwrapper="$output_path/$output_name.exe" ++ $RM $cwrappersource $cwrapper ++ trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 ++ ++ func_emit_cwrapperexe_src > $cwrappersource ++ ++ # The wrapper executable is built using the $host compiler, ++ # because it contains $host paths and files. If cross- ++ # compiling, it, like the target executable, must be ++ # executed on the $host or under an emulation environment. ++ $opt_dry_run || { ++ $LTCC $LTCFLAGS -o $cwrapper $cwrappersource ++ $STRIP $cwrapper ++ } ++ ++ # Now, create the wrapper script for func_source use: ++ func_ltwrapper_scriptname $cwrapper ++ $RM $func_ltwrapper_scriptname_result ++ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 ++ $opt_dry_run || { ++ # note: this script will not be executed, so do not chmod. ++ if test "x$build" = "x$host" ; then ++ $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result ++ else ++ func_emit_wrapper no > $func_ltwrapper_scriptname_result ++ fi ++ } ++ ;; ++ * ) ++ $RM $output ++ trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 ++ ++ func_emit_wrapper no > $output ++ chmod +x $output + ;; + esac +- $rm $output +- trap "$rm $output; exit 1" 1 2 15 +- +- $echo > $output "\ +-#! $SHELL +- +-# $output - temporary wrapper script for $objdir/$outputname +-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP +-# +-# The $output program cannot be directly executed until all the libtool +-# libraries that it depends on are installed. +-# +-# This wrapper script should never be moved out of the build directory. +-# If it is, it will not operate correctly. +- +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-Xsed='${SED} -e 1s/^X//' +-sed_quote_subst='$sed_quote_subst' +- +-# The HP-UX ksh and POSIX shell print the target directory to stdout +-# if CDPATH is set. +-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi +- +-relink_command=\"$relink_command\" +- +-# This environment variable determines our operation mode. +-if test \"\$libtool_install_magic\" = \"$magic\"; then +- # install mode needs the following variable: +- notinst_deplibs='$notinst_deplibs' +-else +- # When we are sourced in execute mode, \$file and \$echo are already set. +- if test \"\$libtool_execute_magic\" != \"$magic\"; then +- echo=\"$qecho\" +- file=\"\$0\" +- # Make sure echo works. +- if test \"X\$1\" = X--no-reexec; then +- # Discard the --no-reexec flag, and continue. +- shift +- elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then +- # Yippee, \$echo works! +- : +- else +- # Restart under the correct shell, and then maybe \$echo will work. +- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} +- fi +- fi\ +-" +- $echo >> $output "\ +- +- # Find the directory that this script lives in. +- thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` +- test \"x\$thisdir\" = \"x\$file\" && thisdir=. +- +- # Follow symbolic links until we get to the real thisdir. +- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` +- while test -n \"\$file\"; do +- destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` +- +- # If there was a directory component, then change thisdir. +- if test \"x\$destdir\" != \"x\$file\"; then +- case \"\$destdir\" in +- [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; +- *) thisdir=\"\$thisdir/\$destdir\" ;; +- esac +- fi +- +- file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` +- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` +- done +- +- # Try to get the absolute directory name. +- absdir=\`cd \"\$thisdir\" && pwd\` +- test -n \"\$absdir\" && thisdir=\"\$absdir\" +-" +- +- if test "$fast_install" = yes; then +- $echo >> $output "\ +- program=lt-'$outputname'$exeext +- progdir=\"\$thisdir/$objdir\" +- +- if test ! -f \"\$progdir/\$program\" || \\ +- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ +- test \"X\$file\" != \"X\$progdir/\$program\"; }; then +- +- file=\"\$\$-\$program\" +- +- if test ! -d \"\$progdir\"; then +- $mkdir \"\$progdir\" +- else +- $rm \"\$progdir/\$file\" +- fi" +- +- $echo >> $output "\ +- +- # relink executable if necessary +- if test -n \"\$relink_command\"; then +- if relink_command_output=\`eval \$relink_command 2>&1\`; then : +- else +- $echo \"\$relink_command_output\" >&2 +- $rm \"\$progdir/\$file\" +- exit 1 +- fi +- fi +- +- $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || +- { $rm \"\$progdir/\$program\"; +- $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } +- $rm \"\$progdir/\$file\" +- fi" +- else +- $echo >> $output "\ +- program='$outputname' +- progdir=\"\$thisdir/$objdir\" +-" +- fi +- +- $echo >> $output "\ +- +- if test -f \"\$progdir/\$program\"; then" +- +- # Export our shlibpath_var if we have one. +- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then +- $echo >> $output "\ +- # Add our own library path to $shlibpath_var +- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" +- +- # Some systems cannot cope with colon-terminated $shlibpath_var +- # The second colon is a workaround for a bug in BeOS R4 sed +- $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` +- +- export $shlibpath_var +-" +- fi +- +- # fixup the dll searchpath if we need to. +- if test -n "$dllsearchpath"; then +- $echo >> $output "\ +- # Add the dll search path components to the executable PATH +- PATH=$dllsearchpath:\$PATH +-" +- fi +- +- $echo >> $output "\ +- if test \"\$libtool_execute_magic\" != \"$magic\"; then +- # Run the actual program with our arguments. +-" +- case $host in +- # Backslashes separate directories on plain windows +- *-*-mingw | *-*-os2*) +- $echo >> $output "\ +- exec \$progdir\\\\\$program \${1+\"\$@\"} +-" +- ;; +- +- *) +- $echo >> $output "\ +- exec \$progdir/\$program \${1+\"\$@\"} +-" +- ;; +- esac +- $echo >> $output "\ +- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" +- exit 1 +- fi +- else +- # The program doesn't exist. +- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 +- \$echo \"This script is just a wrapper for \$program.\" 1>&2 +- $echo \"See the $PACKAGE documentation for more information.\" 1>&2 +- exit 1 +- fi +-fi\ +-" +- chmod +x $output +- fi +- exit 0 ++ } ++ exit $EXIT_SUCCESS + ;; + esac + +@@ -4956,7 +7881,7 @@ + for oldlib in $oldlibs; do + + if test "$build_libtool_libs" = convenience; then +- oldobjs="$libobjs_save" ++ oldobjs="$libobjs_save $symfileobj" + addlibs="$convenience" + build_libtool_libs=no + else +@@ -4965,126 +7890,122 @@ + build_libtool_libs=no + else + oldobjs="$old_deplibs $non_pic_objects" ++ if test "$preload" = yes && test -f "$symfileobj"; then ++ oldobjs="$oldobjs $symfileobj" ++ fi + fi + addlibs="$old_convenience" + fi + + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" +- $show "${rm}r $gentop" +- $run ${rm}r "$gentop" +- $show "$mkdir $gentop" +- $run $mkdir "$gentop" +- status=$? +- if test "$status" -ne 0 && test ! -d "$gentop"; then +- exit $status +- fi + generated="$generated $gentop" + +- # Add in members from convenience archives. +- for xlib in $addlibs; do +- # Extract the objects. +- case $xlib in +- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; +- *) xabs=`pwd`"/$xlib" ;; +- esac +- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` +- xdir="$gentop/$xlib" +- +- $show "${rm}r $xdir" +- $run ${rm}r "$xdir" +- $show "$mkdir $xdir" +- $run $mkdir "$xdir" +- status=$? +- if test "$status" -ne 0 && test ! -d "$xdir"; then +- exit $status +- fi +- # We will extract separately just the conflicting names and we will no +- # longer touch any unique names. It is faster to leave these extract +- # automatically by $AR in one run. +- $show "(cd $xdir && $AR x $xabs)" +- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? +- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then +- : +- else +- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 +- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 +- $AR t "$xabs" | sort | uniq -cd | while read -r count name +- do +- i=1 +- while test "$i" -le "$count" +- do +- # Put our $i before any first dot (extension) +- # Never overwrite any file +- name_to="$name" +- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" +- do +- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` +- done +- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" +- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? +- i=`expr $i + 1` +- done +- done +- fi +- +- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` +- done ++ func_extract_archives $gentop $addlibs ++ oldobjs="$oldobjs $func_extract_archives_result" + fi + + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then +- cmds=$old_archive_from_new_cmds ++ cmds=$old_archive_from_new_cmds + else ++ ++ # Add any objects from preloaded convenience libraries ++ if test -n "$dlprefiles"; then ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" ++ ++ func_extract_archives $gentop $dlprefiles ++ oldobjs="$oldobjs $func_extract_archives_result" ++ fi ++ ++ # POSIX demands no paths to be encoded in archives. We have ++ # to avoid creating archives with duplicate basenames if we ++ # might have to extract them afterwards, e.g., when creating a ++ # static archive out of a convenience library, or when linking ++ # the entirety of a libtool archive into another (currently ++ # not supported by libtool). ++ if (for obj in $oldobjs ++ do ++ func_basename "$obj" ++ $ECHO "$func_basename_result" ++ done | sort | sort -uc >/dev/null 2>&1); then ++ : ++ else ++ $ECHO "copying selected object files to avoid basename conflicts..." ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" ++ func_mkdir_p "$gentop" ++ save_oldobjs=$oldobjs ++ oldobjs= ++ counter=1 ++ for obj in $save_oldobjs ++ do ++ func_basename "$obj" ++ objbase="$func_basename_result" ++ case " $oldobjs " in ++ " ") oldobjs=$obj ;; ++ *[\ /]"$objbase "*) ++ while :; do ++ # Make sure we don't pick an alternate name that also ++ # overlaps. ++ newobj=lt$counter-$objbase ++ func_arith $counter + 1 ++ counter=$func_arith_result ++ case " $oldobjs " in ++ *[\ /]"$newobj "*) ;; ++ *) if test ! -f "$gentop/$newobj"; then break; fi ;; ++ esac ++ done ++ func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" ++ oldobjs="$oldobjs $gentop/$newobj" ++ ;; ++ *) oldobjs="$oldobjs $obj" ;; ++ esac ++ done ++ fi + eval cmds=\"$old_archive_cmds\" + +- if len=`expr "X$cmds" : ".*"` && +- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ func_len " $cmds" ++ len=$func_len_result ++ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts +- $echo "using piecewise archive linking..." ++ func_verbose "using piecewise archive linking..." + save_RANLIB=$RANLIB + RANLIB=: + objlist= + concat_cmds= + save_oldobjs=$oldobjs +- # GNU ar 2.10+ was changed to match POSIX; thus no paths are +- # encoded into archives. This makes 'ar r' malfunction in +- # this piecewise linking case whenever conflicting object +- # names appear in distinct ar calls; check, warn and compensate. +- if (for obj in $save_oldobjs +- do +- $echo "X$obj" | $Xsed -e 's%^.*/%%' +- done | sort | sort -uc >/dev/null 2>&1); then +- : +- else +- $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2 +- $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2 +- AR_FLAGS=cq +- fi ++ oldobjs= + # Is there a better way of finding the last object in the list? + for obj in $save_oldobjs + do + last_oldobj=$obj +- done ++ done ++ eval test_cmds=\"$old_archive_cmds\" ++ func_len " $test_cmds" ++ len0=$func_len_result ++ len=$len0 + for obj in $save_oldobjs + do +- oldobjs="$objlist $obj" +- objlist="$objlist $obj" +- eval test_cmds=\"$old_archive_cmds\" +- if len=`expr "X$test_cmds" : ".*"` && +- test "$len" -le "$max_cmd_len"; then ++ func_len " $obj" ++ func_arith $len + $func_len_result ++ len=$func_arith_result ++ func_append objlist " $obj" ++ if test "$len" -lt "$max_cmd_len"; then + : + else + # the above command should be used before it gets too long + oldobjs=$objlist + if test "$obj" = "$last_oldobj" ; then +- RANLIB=$save_RANLIB +- fi ++ RANLIB=$save_RANLIB ++ fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= ++ len=$len0 + fi + done + RANLIB=$save_RANLIB +@@ -5096,47 +8017,39 @@ + fi + fi + fi +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- eval cmd=\"$cmd\" +- IFS="$save_ifs" +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" ++ func_execute_cmds "$cmds" 'exit $?' + done + +- if test -n "$generated"; then +- $show "${rm}r$generated" +- $run ${rm}r$generated +- fi ++ test -n "$generated" && \ ++ func_show_eval "${RM}r$generated" + + # Now create the libtool archive. + case $output in + *.la) + old_library= + test "$build_old_libs" = yes && old_library="$libname.$libext" +- $show "creating $output" ++ func_verbose "creating $output" + + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then +- relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" ++ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else +- var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` +- relink_command="$var=\"$var_value\"; export $var; $relink_command" ++ func_quote_for_eval "$var_value" ++ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi + done + # Quote the link command for shipping. +- relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" +- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` ++ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" ++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + if test "$hardcode_automatic" = yes ; then +- relink_command= +- fi ++ relink_command= ++ fi ++ + # Only create the output if not a dry run. +- if test -z "$run"; then ++ $opt_dry_run || { + for installed in no yes; do + if test "$installed" = yes; then + if test -z "$install_libdir"; then +@@ -5148,12 +8061,11 @@ + for deplib in $dependency_libs; do + case $deplib in + *.la) +- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` ++ func_basename "$deplib" ++ name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` +- if test -z "$libdir"; then +- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 +- exit 1 +- fi ++ test -z "$libdir" && \ ++ func_fatal_error "\`$deplib' is not a valid libtool archive" + newdependency_libs="$newdependency_libs $libdir/$name" + ;; + *) newdependency_libs="$newdependency_libs $deplib" ;; +@@ -5161,31 +8073,43 @@ + done + dependency_libs="$newdependency_libs" + newdlfiles= ++ + for lib in $dlfiles; do +- name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` +- if test -z "$libdir"; then +- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- exit 1 +- fi +- newdlfiles="$newdlfiles $libdir/$name" ++ case $lib in ++ *.la) ++ func_basename "$lib" ++ name="$func_basename_result" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ test -z "$libdir" && \ ++ func_fatal_error "\`$lib' is not a valid libtool archive" ++ newdlfiles="$newdlfiles $libdir/$name" ++ ;; ++ *) newdlfiles="$newdlfiles $lib" ;; ++ esac + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do +- name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` +- if test -z "$libdir"; then +- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- exit 1 +- fi +- newdlprefiles="$newdlprefiles $libdir/$name" ++ case $lib in ++ *.la) ++ # Only pass preopened files to the pseudo-archive (for ++ # eventual linking with the app. that links it) if we ++ # didn't already link the preopened objects directly into ++ # the library: ++ func_basename "$lib" ++ name="$func_basename_result" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ test -z "$libdir" && \ ++ func_fatal_error "\`$lib' is not a valid libtool archive" ++ newdlprefiles="$newdlprefiles $libdir/$name" ++ ;; ++ esac + done + dlprefiles="$newdlprefiles" + else + newdlfiles= + for lib in $dlfiles; do +- case $lib in ++ case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac +@@ -5194,7 +8118,7 @@ + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do +- case $lib in ++ case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac +@@ -5202,15 +8126,15 @@ + done + dlprefiles="$newdlprefiles" + fi +- $rm $output ++ $RM $output + # place dlname in correct position for cygwin + tdlname=$dlname + case $host,$output,$installed,$module,$dlname in +- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; ++ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + esac +- $echo > $output "\ ++ $ECHO > $output "\ + # $outputname - a libtool library file +-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP ++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION + # + # Please DO NOT delete this file! + # It is necessary for linking the library. +@@ -5224,9 +8148,15 @@ + # The name of the static archive. + old_library='$old_library' + ++# Linker flags that can not go in dependency_libs. ++inherited_linker_flags='$new_inherited_linker_flags' ++ + # Libraries that this one depends upon. + dependency_libs='$dependency_libs' + ++# Names of additional weak libraries provided by this library ++weak_library_names='$weak_libs' ++ + # Version information for $libname. + current=$current + age=$age +@@ -5245,780 +8175,62 @@ + # Directory that this library needs to be installed in: + libdir='$install_libdir'" + if test "$installed" = no && test "$need_relink" = yes; then +- $echo >> $output "\ ++ $ECHO >> $output "\ + relink_command=\"$relink_command\"" + fi + done +- fi ++ } + + # Do a symbolic link so that the libtool archive can be found in + # LD_LIBRARY_PATH before the program is installed. +- $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" +- $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? ++ func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' + ;; + esac +- exit 0 +- ;; +- +- # libtool install mode +- install) +- modename="$modename: install" +- +- # There may be an optional sh(1) argument at the beginning of +- # install_prog (especially on Windows NT). +- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || +- # Allow the use of GNU shtool's install command. +- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then +- # Aesthetically quote it. +- arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) +- arg="\"$arg\"" +- ;; +- esac +- install_prog="$arg " +- arg="$1" +- shift +- else +- install_prog= +- arg="$nonopt" +- fi +- +- # The real first argument should be the name of the installation program. +- # Aesthetically quote it. +- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) +- arg="\"$arg\"" +- ;; +- esac +- install_prog="$install_prog$arg" +- +- # We need to accept at least all the BSD install flags. +- dest= ++ exit $EXIT_SUCCESS ++} ++ ++{ test "$mode" = link || test "$mode" = relink; } && ++ func_mode_link ${1+"$@"} ++ ++ ++# func_mode_uninstall arg... ++func_mode_uninstall () ++{ ++ $opt_debug ++ RM="$nonopt" + files= +- opts= +- prev= +- install_type= +- isdir=no +- stripme= +- for arg +- do +- if test -n "$dest"; then +- files="$files $dest" +- dest="$arg" +- continue +- fi +- +- case $arg in +- -d) isdir=yes ;; +- -f) prev="-f" ;; +- -g) prev="-g" ;; +- -m) prev="-m" ;; +- -o) prev="-o" ;; +- -s) +- stripme=" -s" +- continue +- ;; +- -*) ;; +- +- *) +- # If the previous option needed an argument, then skip it. +- if test -n "$prev"; then +- prev= +- else +- dest="$arg" +- continue +- fi +- ;; +- esac +- +- # Aesthetically quote the argument. +- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) +- arg="\"$arg\"" +- ;; +- esac +- install_prog="$install_prog $arg" +- done +- +- if test -z "$install_prog"; then +- $echo "$modename: you must specify an install program" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- fi +- +- if test -n "$prev"; then +- $echo "$modename: the \`$prev' option requires an argument" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- fi +- +- if test -z "$files"; then +- if test -z "$dest"; then +- $echo "$modename: no file or destination specified" 1>&2 +- else +- $echo "$modename: you must specify a destination" 1>&2 +- fi +- $echo "$help" 1>&2 +- exit 1 +- fi +- +- # Strip any trailing slash from the destination. +- dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` +- +- # Check to see that the destination is a directory. +- test -d "$dest" && isdir=yes +- if test "$isdir" = yes; then +- destdir="$dest" +- destname= +- else +- destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` +- test "X$destdir" = "X$dest" && destdir=. +- destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` +- +- # Not a directory, so check to see that there is only one file specified. +- set dummy $files +- if test "$#" -gt 2; then +- $echo "$modename: \`$dest' is not a directory" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- fi +- fi +- case $destdir in +- [\\/]* | [A-Za-z]:[\\/]*) ;; +- *) +- for file in $files; do +- case $file in +- *.lo) ;; +- *) +- $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- ;; +- esac +- done +- ;; +- esac ++ rmforce= ++ exit_status=0 + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic="$magic" + +- staticlibs= +- future_libdirs= +- current_libdirs= +- for file in $files; do +- +- # Do each installation. +- case $file in +- *.$libext) +- # Do the static libraries later. +- staticlibs="$staticlibs $file" +- ;; +- +- *.la) +- # Check to see that this really is a libtool archive. +- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : +- else +- $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- fi +- +- library_names= +- old_library= +- relink_command= +- # If there is no directory component, then add one. +- case $file in +- */* | *\\*) . $file ;; +- *) . ./$file ;; +- esac +- +- # Add the libdir to current_libdirs if it is the destination. +- if test "X$destdir" = "X$libdir"; then +- case "$current_libdirs " in +- *" $libdir "*) ;; +- *) current_libdirs="$current_libdirs $libdir" ;; +- esac +- else +- # Note the libdir as a future libdir. +- case "$future_libdirs " in +- *" $libdir "*) ;; +- *) future_libdirs="$future_libdirs $libdir" ;; +- esac +- fi +- +- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ +- test "X$dir" = "X$file/" && dir= +- dir="$dir$objdir" +- +- if test -n "$relink_command"; then +- # Determine the prefix the user has applied to our future dir. +- inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` +- +- # Don't allow the user to place us outside of our expected +- # location b/c this prevents finding dependent libraries that +- # are installed to the same prefix. +- # At present, this check doesn't affect windows .dll's that +- # are installed into $libdir/../bin (currently, that works fine) +- # but it's something to keep an eye on. +- if test "$inst_prefix_dir" = "$destdir"; then +- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 +- exit 1 +- fi +- +- if test -n "$inst_prefix_dir"; then +- # Stick the inst_prefix_dir data into the link command. +- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` +- else +- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` +- fi +- +- $echo "$modename: warning: relinking \`$file'" 1>&2 +- $show "$relink_command" +- if $run eval "$relink_command"; then : +- else +- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 +- exit 1 +- fi +- fi +- +- # See the names of the shared library. +- set dummy $library_names +- if test -n "$2"; then +- realname="$2" +- shift +- shift +- +- srcname="$realname" +- test -n "$relink_command" && srcname="$realname"T +- +- # Install the shared library and build the symlinks. +- $show "$install_prog $dir/$srcname $destdir/$realname" +- $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? +- if test -n "$stripme" && test -n "$striplib"; then +- $show "$striplib $destdir/$realname" +- $run eval "$striplib $destdir/$realname" || exit $? +- fi +- +- if test "$#" -gt 0; then +- # Delete the old symlinks, and create new ones. +- for linkname +- do +- if test "$linkname" != "$realname"; then +- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" +- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" +- fi +- done +- fi +- +- # Do each command in the postinstall commands. +- lib="$destdir/$realname" +- cmds=$postinstall_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" +- fi +- +- # Install the pseudo-library for information purposes. +- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` +- instname="$dir/$name"i +- $show "$install_prog $instname $destdir/$name" +- $run eval "$install_prog $instname $destdir/$name" || exit $? +- +- # Maybe install the static library, too. +- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" +- ;; +- +- *.lo) +- # Install (i.e. copy) a libtool object. +- +- # Figure out destination file name, if it wasn't already specified. +- if test -n "$destname"; then +- destfile="$destdir/$destname" +- else +- destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` +- destfile="$destdir/$destfile" +- fi +- +- # Deduce the name of the destination old-style object file. +- case $destfile in +- *.lo) +- staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` +- ;; +- *.$objext) +- staticdest="$destfile" +- destfile= +- ;; +- *) +- $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- ;; +- esac +- +- # Install the libtool object if requested. +- if test -n "$destfile"; then +- $show "$install_prog $file $destfile" +- $run eval "$install_prog $file $destfile" || exit $? +- fi +- +- # Install the old object if enabled. +- if test "$build_old_libs" = yes; then +- # Deduce the name of the old-style object file. +- staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` +- +- $show "$install_prog $staticobj $staticdest" +- $run eval "$install_prog \$staticobj \$staticdest" || exit $? +- fi +- exit 0 +- ;; +- +- *) +- # Figure out destination file name, if it wasn't already specified. +- if test -n "$destname"; then +- destfile="$destdir/$destname" +- else +- destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` +- destfile="$destdir/$destfile" +- fi +- +- # If the file is missing, and there is a .exe on the end, strip it +- # because it is most likely a libtool script we actually want to +- # install +- stripped_ext="" +- case $file in +- *.exe) +- if test ! -f "$file"; then +- file=`$echo $file|${SED} 's,.exe$,,'` +- stripped_ext=".exe" +- fi +- ;; +- esac +- +- # Do a test to see if this is really a libtool program. +- case $host in +- *cygwin*|*mingw*) +- wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` +- ;; +- *) +- wrapper=$file +- ;; +- esac +- if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then +- notinst_deplibs= +- relink_command= +- +- # To insure that "foo" is sourced, and not "foo.exe", +- # finese the cygwin/MSYS system by explicitly sourcing "foo." +- # which disallows the automatic-append-.exe behavior. +- case $build in +- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; +- *) wrapperdot=${wrapper} ;; +- esac +- # If there is no directory component, then add one. +- case $file in +- */* | *\\*) . ${wrapperdot} ;; +- *) . ./${wrapperdot} ;; +- esac +- +- # Check the variables that should have been set. +- if test -z "$notinst_deplibs"; then +- $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 +- exit 1 +- fi +- +- finalize=yes +- for lib in $notinst_deplibs; do +- # Check to see that each library is installed. +- libdir= +- if test -f "$lib"; then +- # If there is no directory component, then add one. +- case $lib in +- */* | *\\*) . $lib ;; +- *) . ./$lib ;; +- esac +- fi +- libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test +- if test -n "$libdir" && test ! -f "$libfile"; then +- $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 +- finalize=no +- fi +- done +- +- relink_command= +- # To insure that "foo" is sourced, and not "foo.exe", +- # finese the cygwin/MSYS system by explicitly sourcing "foo." +- # which disallows the automatic-append-.exe behavior. +- case $build in +- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; +- *) wrapperdot=${wrapper} ;; +- esac +- # If there is no directory component, then add one. +- case $file in +- */* | *\\*) . ${wrapperdot} ;; +- *) . ./${wrapperdot} ;; +- esac +- +- outputname= +- if test "$fast_install" = no && test -n "$relink_command"; then +- if test "$finalize" = yes && test -z "$run"; then +- tmpdir="/tmp" +- test -n "$TMPDIR" && tmpdir="$TMPDIR" +- if tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`; then : +- else +- tmpdir="$tmpdir/libtool-$$" +- if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then : +- else +- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 +- continue +- fi +- fi +- file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` +- outputname="$tmpdir/$file" +- # Replace the output file specification. +- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` +- +- $show "$relink_command" +- if $run eval "$relink_command"; then : +- else +- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 +- ${rm}r "$tmpdir" +- continue +- fi +- file="$outputname" +- else +- $echo "$modename: warning: cannot relink \`$file'" 1>&2 +- fi +- else +- # Install the binary that we compiled earlier. +- file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` +- fi +- fi +- +- # remove .exe since cygwin /usr/bin/install will append another +- # one anyways +- case $install_prog,$host in +- */usr/bin/install*,*cygwin*) +- case $file:$destfile in +- *.exe:*.exe) +- # this is ok +- ;; +- *.exe:*) +- destfile=$destfile.exe +- ;; +- *:*.exe) +- destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` +- ;; +- esac +- ;; +- esac +- $show "$install_prog$stripme $file $destfile" +- $run eval "$install_prog\$stripme \$file \$destfile" || exit $? +- test -n "$outputname" && ${rm}r "$tmpdir" +- ;; +- esac +- done +- +- for file in $staticlibs; do +- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` +- +- # Set up the ranlib parameters. +- oldlib="$destdir/$name" +- +- $show "$install_prog $file $oldlib" +- $run eval "$install_prog \$file \$oldlib" || exit $? +- +- if test -n "$stripme" && test -n "$old_striplib"; then +- $show "$old_striplib $oldlib" +- $run eval "$old_striplib $oldlib" || exit $? +- fi +- +- # Do each command in the postinstall commands. +- cmds=$old_postinstall_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" +- done +- +- if test -n "$future_libdirs"; then +- $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 +- fi +- +- if test -n "$current_libdirs"; then +- # Maybe just do a dry run. +- test -n "$run" && current_libdirs=" -n$current_libdirs" +- exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs' +- else +- exit 0 +- fi +- ;; +- +- # libtool finish mode +- finish) +- modename="$modename: finish" +- libdirs="$nonopt" +- admincmds= +- +- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then +- for dir +- do +- libdirs="$libdirs $dir" +- done +- +- for libdir in $libdirs; do +- if test -n "$finish_cmds"; then +- # Do each command in the finish commands. +- cmds=$finish_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || admincmds="$admincmds +- $cmd" +- done +- IFS="$save_ifs" +- fi +- if test -n "$finish_eval"; then +- # Do the single finish_eval. +- eval cmds=\"$finish_eval\" +- $run eval "$cmds" || admincmds="$admincmds +- $cmds" +- fi +- done +- fi +- +- # Exit here if they wanted silent mode. +- test "$show" = : && exit 0 +- +- $echo "----------------------------------------------------------------------" +- $echo "Libraries have been installed in:" +- for libdir in $libdirs; do +- $echo " $libdir" +- done +- $echo +- $echo "If you ever happen to want to link against installed libraries" +- $echo "in a given directory, LIBDIR, you must either use libtool, and" +- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" +- $echo "flag during linking and do at least one of the following:" +- if test -n "$shlibpath_var"; then +- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" +- $echo " during execution" +- fi +- if test -n "$runpath_var"; then +- $echo " - add LIBDIR to the \`$runpath_var' environment variable" +- $echo " during linking" +- fi +- if test -n "$hardcode_libdir_flag_spec"; then +- libdir=LIBDIR +- eval flag=\"$hardcode_libdir_flag_spec\" +- +- $echo " - use the \`$flag' linker flag" +- fi +- if test -n "$admincmds"; then +- $echo " - have your system administrator run these commands:$admincmds" +- fi +- if test -f /etc/ld.so.conf; then +- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" +- fi +- $echo +- $echo "See any operating system documentation about shared libraries for" +- $echo "more information, such as the ld(1) and ld.so(8) manual pages." +- $echo "----------------------------------------------------------------------" +- exit 0 +- ;; +- +- # libtool execute mode +- execute) +- modename="$modename: execute" +- +- # The first argument is the command name. +- cmd="$nonopt" +- if test -z "$cmd"; then +- $echo "$modename: you must specify a COMMAND" 1>&2 +- $echo "$help" +- exit 1 +- fi +- +- # Handle -dlopen flags immediately. +- for file in $execute_dlfiles; do +- if test ! -f "$file"; then +- $echo "$modename: \`$file' is not a file" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- fi +- +- dir= +- case $file in +- *.la) +- # Check to see that this really is a libtool archive. +- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : +- else +- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- fi +- +- # Read the libtool library. +- dlname= +- library_names= +- +- # If there is no directory component, then add one. +- case $file in +- */* | *\\*) . $file ;; +- *) . ./$file ;; +- esac +- +- # Skip this library if it cannot be dlopened. +- if test -z "$dlname"; then +- # Warn if it was a shared library. +- test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" +- continue +- fi +- +- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` +- test "X$dir" = "X$file" && dir=. +- +- if test -f "$dir/$objdir/$dlname"; then +- dir="$dir/$objdir" +- else +- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 +- exit 1 +- fi +- ;; +- +- *.lo) +- # Just add the directory containing the .lo file. +- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` +- test "X$dir" = "X$file" && dir=. +- ;; +- +- *) +- $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 +- continue +- ;; +- esac +- +- # Get the absolute pathname. +- absdir=`cd "$dir" && pwd` +- test -n "$absdir" && dir="$absdir" +- +- # Now add the directory to shlibpath_var. +- if eval "test -z \"\$$shlibpath_var\""; then +- eval "$shlibpath_var=\"\$dir\"" +- else +- eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" +- fi +- done +- +- # This variable tells wrapper scripts just to set shlibpath_var +- # rather than running their programs. +- libtool_execute_magic="$magic" +- +- # Check if any of the arguments is a wrapper script. +- args= +- for file +- do +- case $file in +- -*) ;; +- *) +- # Do a test to see if this is really a libtool program. +- if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then +- # If there is no directory component, then add one. +- case $file in +- */* | *\\*) . $file ;; +- *) . ./$file ;; +- esac +- +- # Transform arg to wrapped name. +- file="$progdir/$program" +- fi +- ;; +- esac +- # Quote arguments (to preserve shell metacharacters). +- file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` +- args="$args \"$file\"" +- done +- +- if test -z "$run"; then +- if test -n "$shlibpath_var"; then +- # Export the shlibpath_var. +- eval "export $shlibpath_var" +- fi +- +- # Restore saved environment variables +- if test "${save_LC_ALL+set}" = set; then +- LC_ALL="$save_LC_ALL"; export LC_ALL +- fi +- if test "${save_LANG+set}" = set; then +- LANG="$save_LANG"; export LANG +- fi +- +- # Now prepare to actually exec the command. +- exec_cmd="\"\$cmd\"$args" +- else +- # Display what would be done. +- if test -n "$shlibpath_var"; then +- eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" +- $echo "export $shlibpath_var" +- fi +- eval \$echo \"\$cmd\"$args +- exit 0 +- fi +- ;; +- +- # libtool clean and uninstall mode +- clean | uninstall) +- modename="$modename: $mode" +- rm="$nonopt" +- files= +- rmforce= +- exit_status=0 +- +- # This variable tells wrapper scripts just to set variables rather +- # than running their programs. +- libtool_install_magic="$magic" +- + for arg + do + case $arg in +- -f) rm="$rm $arg"; rmforce=yes ;; +- -*) rm="$rm $arg" ;; ++ -f) RM="$RM $arg"; rmforce=yes ;; ++ -*) RM="$RM $arg" ;; + *) files="$files $arg" ;; + esac + done + +- if test -z "$rm"; then +- $echo "$modename: you must specify an RM program" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- fi ++ test -z "$RM" && \ ++ func_fatal_help "you must specify an RM program" + + rmdirs= + + origobjdir="$objdir" + for file in $files; do +- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` +- if test "X$dir" = "X$file"; then +- dir=. ++ func_dirname "$file" "" "." ++ dir="$func_dirname_result" ++ if test "X$dir" = X.; then + objdir="$origobjdir" + else + objdir="$dir/$origobjdir" + fi +- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` ++ func_basename "$file" ++ name="$func_basename_result" + test "$mode" = uninstall && objdir="$dir" + + # Remember objdir for removal later, being careful to avoid duplicates +@@ -6030,9 +8242,9 @@ + fi + + # Don't error if the file doesn't exist and rm -f was used. +- if (test -L "$file") >/dev/null 2>&1 \ +- || (test -h "$file") >/dev/null 2>&1 \ +- || test -f "$file"; then ++ if { test -L "$file"; } >/dev/null 2>&1 || ++ { test -h "$file"; } >/dev/null 2>&1 || ++ test -f "$file"; then + : + elif test -d "$file"; then + exit_status=1 +@@ -6046,69 +8258,56 @@ + case $name in + *.la) + # Possibly a libtool archive, so verify it. +- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then +- . $dir/$name ++ if func_lalib_p "$file"; then ++ func_source $dir/$name + + # Delete the libtool libraries and symlinks. + for n in $library_names; do + rmfiles="$rmfiles $objdir/$n" + done + test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" +- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" +- +- if test "$mode" = uninstall; then ++ ++ case "$mode" in ++ clean) ++ case " $library_names " in ++ # " " in the beginning catches empty $dlname ++ *" $dlname "*) ;; ++ *) rmfiles="$rmfiles $objdir/$dlname" ;; ++ esac ++ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ ;; ++ uninstall) + if test -n "$library_names"; then + # Do each command in the postuninstall commands. +- cmds=$postuninstall_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" +- if test "$?" -ne 0 && test "$rmforce" != yes; then +- exit_status=1 +- fi +- done +- IFS="$save_ifs" ++ func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + fi + + if test -n "$old_library"; then + # Do each command in the old_postuninstall commands. +- cmds=$old_postuninstall_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" +- if test "$?" -ne 0 && test "$rmforce" != yes; then +- exit_status=1 +- fi +- done +- IFS="$save_ifs" ++ func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + fi + # FIXME: should reinstall the best remaining shared library. +- fi ++ ;; ++ esac + fi + ;; + + *.lo) + # Possibly a libtool object, so verify it. +- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then ++ if func_lalib_p "$file"; then + + # Read the .lo file +- . $dir/$name ++ func_source $dir/$name + + # Add PIC object to the list of files to remove. +- if test -n "$pic_object" \ +- && test "$pic_object" != none; then ++ if test -n "$pic_object" && ++ test "$pic_object" != none; then + rmfiles="$rmfiles $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. +- if test -n "$non_pic_object" \ +- && test "$non_pic_object" != none; then ++ if test -n "$non_pic_object" && ++ test "$non_pic_object" != none; then + rmfiles="$rmfiles $dir/$non_pic_object" + fi + fi +@@ -6118,18 +8317,27 @@ + if test "$mode" = clean ; then + noexename=$name + case $file in +- *.exe) +- file=`$echo $file|${SED} 's,.exe$,,'` +- noexename=`$echo $name|${SED} 's,.exe$,,'` ++ *.exe) ++ func_stripname '' '.exe' "$file" ++ file=$func_stripname_result ++ func_stripname '' '.exe' "$name" ++ noexename=$func_stripname_result + # $file with .exe has already been added to rmfiles, + # add $file without .exe + rmfiles="$rmfiles $file" + ;; + esac + # Do a test to see if this is a libtool program. +- if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then +- relink_command= +- . $dir/$noexename ++ if func_ltwrapper_p "$file"; then ++ if func_ltwrapper_executable_p "$file"; then ++ func_ltwrapper_scriptname "$file" ++ relink_command= ++ func_source $func_ltwrapper_scriptname_result ++ rmfiles="$rmfiles $func_ltwrapper_scriptname_result" ++ else ++ relink_command= ++ func_source $dir/$noexename ++ fi + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles +@@ -6144,237 +8352,38 @@ + fi + ;; + esac +- $show "$rm $rmfiles" +- $run $rm $rmfiles || exit_status=1 ++ func_show_eval "$RM $rmfiles" 'exit_status=1' + done + objdir="$origobjdir" + + # Try to remove the ${objdir}s in the directories where we deleted files + for dir in $rmdirs; do + if test -d "$dir"; then +- $show "rmdir $dir" +- $run rmdir $dir >/dev/null 2>&1 ++ func_show_eval "rmdir $dir >/dev/null 2>&1" + fi + done + + exit $exit_status +- ;; +- +- "") +- $echo "$modename: you must specify a MODE" 1>&2 +- $echo "$generic_help" 1>&2 +- exit 1 +- ;; +- esac +- +- if test -z "$exec_cmd"; then +- $echo "$modename: invalid operation mode \`$mode'" 1>&2 +- $echo "$generic_help" 1>&2 +- exit 1 +- fi +-fi # test -z "$show_help" ++} ++ ++{ test "$mode" = uninstall || test "$mode" = clean; } && ++ func_mode_uninstall ${1+"$@"} ++ ++test -z "$mode" && { ++ help="$generic_help" ++ func_fatal_help "you must specify a MODE" ++} ++ ++test -z "$exec_cmd" && \ ++ func_fatal_help "invalid operation mode \`$mode'" + + if test -n "$exec_cmd"; then +- eval exec $exec_cmd +- exit 1 ++ eval exec "$exec_cmd" ++ exit $EXIT_FAILURE + fi + +-# We need to display help for each of the modes. +-case $mode in +-"") $echo \ +-"Usage: $modename [OPTION]... [MODE-ARG]... +- +-Provide generalized library-building support services. +- +- --config show all configuration variables +- --debug enable verbose shell tracing +--n, --dry-run display commands without modifying any files +- --features display basic configuration information and exit +- --finish same as \`--mode=finish' +- --help display this help message and exit +- --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] +- --quiet same as \`--silent' +- --silent don't print informational messages +- --tag=TAG use configuration variables from tag TAG +- --version print version information +- +-MODE must be one of the following: +- +- clean remove files from the build directory +- compile compile a source file into a libtool object +- execute automatically set library path, then run a program +- finish complete the installation of libtool libraries +- install install libraries or executables +- link create a library or an executable +- uninstall remove libraries from an installed directory +- +-MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for +-a more detailed description of MODE. +- +-Report bugs to ." +- exit 0 +- ;; +- +-clean) +- $echo \ +-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... +- +-Remove files from the build directory. +- +-RM is the name of the program to use to delete files associated with each FILE +-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +-to RM. +- +-If FILE is a libtool library, object or program, all the files associated +-with it are deleted. Otherwise, only FILE itself is deleted using RM." +- ;; +- +-compile) +- $echo \ +-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE +- +-Compile a source file into a libtool library object. +- +-This mode accepts the following additional options: +- +- -o OUTPUT-FILE set the output file name to OUTPUT-FILE +- -prefer-pic try to building PIC objects only +- -prefer-non-pic try to building non-PIC objects only +- -static always build a \`.o' file suitable for static linking +- +-COMPILE-COMMAND is a command to be used in creating a \`standard' object file +-from the given SOURCEFILE. +- +-The output file name is determined by removing the directory component from +-SOURCEFILE, then substituting the C source code suffix \`.c' with the +-library object suffix, \`.lo'." +- ;; +- +-execute) +- $echo \ +-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... +- +-Automatically set library path, then run a program. +- +-This mode accepts the following additional options: +- +- -dlopen FILE add the directory containing FILE to the library path +- +-This mode sets the library path environment variable according to \`-dlopen' +-flags. +- +-If any of the ARGS are libtool executable wrappers, then they are translated +-into their corresponding uninstalled binary, and any of their required library +-directories are added to the library path. +- +-Then, COMMAND is executed, with ARGS as arguments." +- ;; +- +-finish) +- $echo \ +-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... +- +-Complete the installation of libtool libraries. +- +-Each LIBDIR is a directory that contains libtool libraries. +- +-The commands that this mode executes may require superuser privileges. Use +-the \`--dry-run' option if you just want to see what would be executed." +- ;; +- +-install) +- $echo \ +-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... +- +-Install executables or libraries. +- +-INSTALL-COMMAND is the installation command. The first component should be +-either the \`install' or \`cp' program. +- +-The rest of the components are interpreted as arguments to that command (only +-BSD-compatible install options are recognized)." +- ;; +- +-link) +- $echo \ +-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... +- +-Link object files or libraries together to form another library, or to +-create an executable program. +- +-LINK-COMMAND is a command using the C compiler that you would use to create +-a program from several object files. +- +-The following components of LINK-COMMAND are treated specially: +- +- -all-static do not do any dynamic linking at all +- -avoid-version do not add a version suffix if possible +- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime +- -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols +- -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) +- -export-symbols SYMFILE +- try to export only the symbols listed in SYMFILE +- -export-symbols-regex REGEX +- try to export only the symbols matching REGEX +- -LLIBDIR search LIBDIR for required installed libraries +- -lNAME OUTPUT-FILE requires the installed library libNAME +- -module build a library that can dlopened +- -no-fast-install disable the fast-install mode +- -no-install link a not-installable executable +- -no-undefined declare that a library does not refer to external symbols +- -o OUTPUT-FILE create OUTPUT-FILE from the specified objects +- -objectlist FILE Use a list of object files found in FILE to specify objects +- -precious-files-regex REGEX +- don't remove output files matching REGEX +- -release RELEASE specify package release information +- -rpath LIBDIR the created library will eventually be installed in LIBDIR +- -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries +- -static do not do any dynamic linking of libtool libraries +- -version-info CURRENT[:REVISION[:AGE]] +- specify library version info [each variable defaults to 0] +- +-All other options (arguments beginning with \`-') are ignored. +- +-Every other argument is treated as a filename. Files ending in \`.la' are +-treated as uninstalled libtool libraries, other files are standard or library +-object files. +- +-If the OUTPUT-FILE ends in \`.la', then a libtool library is created, +-only library objects (\`.lo' files) may be specified, and \`-rpath' is +-required, except when creating a convenience library. +- +-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created +-using \`ar' and \`ranlib', or on Windows using \`lib'. +- +-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +-is created, otherwise an executable program is created." +- ;; +- +-uninstall) +- $echo \ +-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... +- +-Remove libraries from an installation directory. +- +-RM is the name of the program to use to delete files associated with each FILE +-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +-to RM. +- +-If FILE is a libtool library, all the files associated with it are deleted. +-Otherwise, only FILE itself is deleted using RM." +- ;; +- +-*) +- $echo "$modename: invalid operation mode \`$mode'" 1>&2 +- $echo "$help" 1>&2 +- exit 1 +- ;; +-esac +- +-$echo +-$echo "Try \`$modename --help' for more information about other modes." +- +-exit 0 ++exit $exit_status ++ + + # The TAGs below are defined such that we never get into a situation + # in which we disable both kinds of libraries. Given conflicting +@@ -6393,10 +8402,12 @@ + # ### END LIBTOOL TAG CONFIG: disable-shared + + # ### BEGIN LIBTOOL TAG CONFIG: disable-static +-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` ++build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` + # ### END LIBTOOL TAG CONFIG: disable-static + + # Local Variables: + # mode:shell-script + # sh-indentation:2 + # End: ++# vi:sw=2 ++ +diff -r 3c8a74e0c599 config/missing +--- a/config/missing Sun Apr 11 12:41:30 2010 +0200 ++++ b/config/missing Sun Apr 11 16:31:36 2010 +0200 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. + +-scriptversion=2003-09-02.23 ++scriptversion=2009-04-28.21; # UTC + +-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, ++# 2008, 2009 Free Software Foundation, Inc. + # Originally by Fran,cois Pinard , 1996. + + # This program is free software; you can redistribute it and/or modify +@@ -18,9 +18,7 @@ + # 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. ++# along with this program. If not, see . + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -33,6 +31,8 @@ + fi + + run=: ++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' ++sed_minuso='s/.* -o \([^ ]*\).*/\1/p' + + # In the cases where this matters, `missing' is being run in the + # srcdir already. +@@ -44,7 +44,7 @@ + + msg="missing on your system" + +-case "$1" in ++case $1 in + --run) + # Try to run requested program, and just exit if it succeeds. + run= +@@ -60,11 +60,6 @@ + msg="probably too old" + fi + ;; +-esac +- +-# If it does not exist, or fails to run (possibly an outdated version), +-# try to emulate it. +-case "$1" in + + -h|--h|--he|--hel|--help) + echo "\ +@@ -82,6 +77,7 @@ + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' ++ autom4te touch the output file, or create a stub one + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c +@@ -91,11 +87,16 @@ + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + ++Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and ++\`g' are ignored when checking the name. ++ + Send bug reports to ." ++ exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" ++ exit $? + ;; + + -*) +@@ -104,12 +105,49 @@ + exit 1 + ;; + +- aclocal*) ++esac ++ ++# normalize program name to check for. ++program=`echo "$1" | sed ' ++ s/^gnu-//; t ++ s/^gnu//; t ++ s/^g//; t'` ++ ++# Now exit if we have it, but it failed. Also exit now if we ++# don't have it and --version was passed (most likely to detect ++# the program). This is about non-GNU programs, so use $1 not ++# $program. ++case $1 in ++ lex*|yacc*) ++ # Not GNU programs, they don't have --version. ++ ;; ++ ++ tar*) ++ if test -n "$run"; then ++ echo 1>&2 "ERROR: \`tar' requires --run" ++ exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ exit 1 ++ fi ++ ;; ++ ++ *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ # Could not run --version or --help. This is probably someone ++ # running `$TOOL --version' or `$TOOL --help' to check whether ++ # $TOOL exists and not knowing $TOOL uses missing. ++ exit 1 + fi ++ ;; ++esac + ++# If it does not exist, or fails to run (possibly an outdated version), ++# try to emulate it. ++case $program in ++ aclocal*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want +@@ -118,12 +156,7 @@ + touch aclocal.m4 + ;; + +- autoconf) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- ++ autoconf*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the +@@ -132,12 +165,7 @@ + touch configure + ;; + +- autoheader) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- ++ autoheader*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want +@@ -147,7 +175,7 @@ + test -z "$files" && files="config.h" + touch_files= + for f in $files; do +- case "$f" in ++ case $f in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; +@@ -157,11 +185,6 @@ + ;; + + automake*) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. +@@ -172,12 +195,7 @@ + while read f; do touch "$f"; done + ;; + +- autom4te) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- ++ autom4te*) + echo 1>&2 "\ + WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the +@@ -185,8 +203,8 @@ + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + +- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` +- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else +@@ -200,90 +218,78 @@ + fi + ;; + +- bison|yacc) ++ bison*|yacc*) + echo 1>&2 "\ + WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h +- if [ $# -ne 1 ]; then ++ if test $# -ne 1; then + eval LASTARG="\${$#}" +- case "$LASTARG" in ++ case $LASTARG in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi +- if [ ! -f y.tab.h ]; then ++ if test ! -f y.tab.h; then + echo >y.tab.h + fi +- if [ ! -f y.tab.c ]; then ++ if test ! -f y.tab.c; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + +- lex|flex) ++ lex*|flex*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c +- if [ $# -ne 1 ]; then ++ if test $# -ne 1; then + eval LASTARG="\${$#}" +- case "$LASTARG" in ++ case $LASTARG in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi +- if [ ! -f lex.yy.c ]; then ++ if test ! -f lex.yy.c; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + +- help2man) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- ++ help2man*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + +- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` +- if test -z "$file"; then +- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` +- fi +- if [ -f "$file" ]; then ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ++ if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" +- exit 1 ++ exit $? + fi + ;; + +- makeinfo) +- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then +- # We have makeinfo, but it failed. +- exit 1 +- fi +- ++ makeinfo*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file +@@ -291,20 +297,29 @@ + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." +- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` ++ # The file to touch is that specified with -o ... ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -z "$file"; then +- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` ++ # ... or it is the one specified with @setfilename ... ++ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ++ file=`sed -n ' ++ /^@setfilename/{ ++ s/.* \([^ ]*\) *$/\1/ ++ p ++ q ++ }' $infile` ++ # ... or it is derived from the source name (dir/f.texi becomes f.info) ++ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi ++ # If the file does not exist, the user really needs makeinfo; ++ # let's fail without touching anything. ++ test -f $file || exit 1 + touch $file + ;; + +- tar) ++ tar*) + shift +- if test -n "$run"; then +- echo 1>&2 "ERROR: \`tar' requires --run" +- exit 1 +- fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error +@@ -317,13 +332,13 @@ + fi + firstarg="$1" + if shift; then +- case "$firstarg" in ++ case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac +- case "$firstarg" in ++ case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 +@@ -356,5 +371,6 @@ + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-end: "$" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" + # End: +diff -r 3c8a74e0c599 configure +--- a/configure Sun Apr 11 12:41:30 2010 +0200 ++++ b/configure Sun Apr 11 16:31:36 2010 +0200 +@@ -2,11 +2,16 @@ + # From acinclude.m4 Revision: 1.177.14.2 . + # From configure.ac Revision: 1.410.2.9 . + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.59 for blcr 0.8.2. ++# Generated by GNU Autoconf 2.65 for blcr 0.8.2. + # + # Report bugs to . + # +-# Copyright (C) 2003 Free Software Foundation, Inc. ++# ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. ++# ++# + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + # +@@ -33,77 +38,407 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + # +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## +- +-# Be Bourne compatible +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## ++ ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +- set -o posix +-fi +-DUALCASE=1; export DUALCASE # for MKS sh +- +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi +- +- +-# Work around bugs in pre-3.0 UWIN ksh. +-$as_unset ENV MAIL MAILPATH ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac ++fi ++ ++ ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' ++ else ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in #( ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' ++ fi ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' ++fi ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } ++fi ++ ++ ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in #(( ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ exit 1 ++fi ++ ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : ++done + PS1='$ ' + PS2='> ' + PS4='+ ' + + # NLS nuisances. +-for as_var in \ +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ +- LC_TELEPHONE LC_TIME +-do +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then +- eval $as_var=C; export $as_var +- else +- $as_unset $as_var +- fi +-done +- +-# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1; then ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE ++ ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++if test "x$CONFIG_SHELL" = x; then ++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' ++ setopt NO_GLOB_SUBST ++else ++ case \`(set -o) 2>/dev/null\` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac ++fi ++" ++ as_required="as_fn_return () { (exit \$1); } ++as_fn_success () { as_fn_return 0; } ++as_fn_failure () { as_fn_return 1; } ++as_fn_ret_success () { return 0; } ++as_fn_ret_failure () { return 1; } ++ ++exitcode=0 ++as_fn_success || { exitcode=1; echo as_fn_success failed.; } ++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } ++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } ++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } ++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : ++ ++else ++ exitcode=1; echo positional parameters were not saved. ++fi ++test x\$exitcode = x0 || exit 1" ++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO ++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO ++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && ++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 ++test \$(( 1 + 1 )) = 2 || exit 1" ++ if (eval "$as_required") 2>/dev/null; then : ++ as_have_required=yes ++else ++ as_have_required=no ++fi ++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : ++ ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++as_found=false ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ as_found=: ++ case $as_dir in #( ++ /*) ++ for as_base in sh bash ksh sh5; do ++ # Try only shells that exist, to save several forks. ++ as_shell=$as_dir/$as_base ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ CONFIG_SHELL=$as_shell as_have_required=yes ++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ break 2 ++fi ++fi ++ done;; ++ esac ++ as_found=false ++done ++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : ++ CONFIG_SHELL=$SHELL as_have_required=yes ++fi; } ++IFS=$as_save_IFS ++ ++ ++ if test "x$CONFIG_SHELL" != x; then : ++ # We cannot yet assume a decent shell, so we have to provide a ++ # neutralization value for shells without unset; and this also ++ # works around shells that cannot unset nonexistent variables. ++ BASH_ENV=/dev/null ++ ENV=/dev/null ++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++fi ++ ++ if test x$as_have_required = xno; then : ++ $as_echo "$0: This script requires a shell more modern than all" ++ $as_echo "$0: the shells that I found on your system." ++ if test x${ZSH_VERSION+set} = xset ; then ++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" ++ $as_echo "$0: be upgraded to zsh 4.3.4 or later." ++ else ++ $as_echo "$0: Please tell bug-autoconf@gnu.org and ++$0: http://ftg.lbl.gov/checkpoint about your system, ++$0: including any error possibly output before this ++$0: message. Then install a modern shell, or manually run ++$0: the script under such a shell if you do have one." ++ fi ++ exit 1 ++fi ++fi ++fi ++SHELL=${CONFIG_SHELL-/bin/sh} ++export SHELL ++# Unset more variables known to interfere with behavior of common tools. ++CLICOLOR_FORCE= GREP_OPTIONS= ++unset CLICOLOR_FORCE GREP_OPTIONS ++ ++## --------------------- ## ++## M4sh Shell Functions. ## ++## --------------------- ## ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ ++ ++} # as_fn_mkdir_p ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ ++# as_fn_error ERROR [LINENO LOG_FD] ++# --------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with status $?, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr + else + as_expr=false + fi + +-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename + else + as_basename=false + fi + +- +-# Name of the executable. +-as_me=`$as_basename "$0" || ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)$' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } +- /^X\/\(\/\/\)$/{ s//\1/; q; } +- /^X\/\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- +- +-# PATH needs CR, and LINENO needs CR and PATH. ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ + # Avoid depending upon Character Ranges. + as_cr_letters='abcdefghijklmnopqrstuvwxyz' + as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +@@ -111,146 +446,107 @@ + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' +- else +- PATH_SEPARATOR=: +- fi +- rm -f conf$$.sh +-fi +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" || { +- # Find who we are. Look in the path if we contain no path at all +- # relative or not. +- case $0 in +- *[\\/]* ) as_myself=$0 ;; +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done +- +- ;; +- esac +- # We did not find ourselves, most probably we were run as `sh COMMAND' +- # in which case we are not to be found in the path. +- if test "x$as_myself" = x; then +- as_myself=$0 +- fi +- if test ! -f "$as_myself"; then +- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 +- { (exit 1); exit 1; }; } +- fi +- case $CONFIG_SHELL in +- '') +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for as_base in sh bash ksh sh5; do +- case $as_dir in +- /*) +- if ("$as_dir/$as_base" -c ' +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then +- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } +- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } +- CONFIG_SHELL=$as_dir/$as_base +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$0" ${1+"$@"} +- fi;; +- esac +- done +-done +-;; +- esac +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line before each line; the second 'sed' does the real +- # work. The second script uses 'N' to pair each line-number line +- # with the numbered line, and appends trailing '-' during +- # substitution so that $LINENO is not a special case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) +- sed '=' <$as_myself | ++ ++ as_lineno_1=$LINENO as_lineno_1a=$LINENO ++ as_lineno_2=$LINENO as_lineno_2a=$LINENO ++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && ++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { ++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | + sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno + N +- s,$,-, +- : loop +- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop +- s,-$,, +- s,^['$as_cr_digits']*\n,, ++ s/-\n.*// + ' >$as_me.lineno && +- chmod +x $as_me.lineno || +- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } ++ chmod +x "$as_me.lineno" || ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensible to this). +- . ./$as_me.lineno ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" + # Exit status is that of the last command. + exit + } + +- +-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +- *c*,-n*) ECHO_N= ECHO_C=' +-' ECHO_T=' ' ;; +- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; +- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +-esac +- +-if expr a : '\(a\)' >/dev/null 2>&1; then +- as_expr=expr +-else +- as_expr=false +-fi ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in #((((( ++-n*) ++ case `echo 'xy\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac + + rm -f conf$$ conf$$.exe conf$$.file +-echo >conf$$.file +-if ln -s conf$$.file conf$$ 2>/dev/null; then +- # We could just check for DJGPP; but this test a) works b) is more generic +- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). +- if test -f conf$$.exe; then +- # Don't use ln at all; we don't have any links ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir 2>/dev/null ++fi ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else + as_ln_s='cp -p' +- else +- as_ln_s='ln -s' +- fi +-elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln ++ fi + else + as_ln_s='cp -p' + fi +-rm -f conf$$ conf$$.exe conf$$.file ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null + + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false + fi + +-as_executable_p="test -f" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' ++else ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in #( ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' ++fi ++as_executable_p=$as_test_x + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -259,36 +555,26 @@ + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +-# IFS +-# We need space, tab and new line, in precisely that order. +-as_nl=' +-' +-IFS=" $as_nl" +- +-# CDPATH. +-$as_unset CDPATH +- +- + + # Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + +-case X$ECHO in ++case X$lt_ECHO in + X*--fallback-echo) + # Remove one level of quotation (which was required for Make). +- ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` +- ;; +-esac +- +-echo=${ECHO-echo} ++ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` ++ ;; ++esac ++ ++ECHO=${lt_ECHO-echo} + if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then +- # Yippee, $echo works! ++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $ECHO works! + : + else + # Restart under the correct shell. +@@ -298,153 +584,145 @@ + if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift +- cat </dev/null && +- echo_test_string="`eval $cmd`" && +- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null +- then +- break +- fi +- done +-fi +- +-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- : +-else +- # The Solaris, AIX, and Digital Unix default echo programs unquote +- # backslashes. This makes it impossible to quote backslashes using +- # echo "$something" | sed 's/\\/\\\\/g' +- # +- # So, first we look for a working echo in the user's PATH. +- +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for dir in $PATH /usr/ucb; do ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++if test -z "$lt_ECHO"; then ++ if test "X${echo_test_string+set}" != Xset; then ++ # find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if { echo_test_string=`eval $cmd`; } 2>/dev/null && ++ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null ++ then ++ break ++ fi ++ done ++ fi ++ ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++ else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. ++ ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$dir/echo" ++ break ++ fi ++ done + IFS="$lt_save_ifs" +- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && +- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$dir/echo" +- break +- fi +- done +- IFS="$lt_save_ifs" +- +- if test "X$echo" = Xecho; then +- # We didn't find a better echo, so look for alternatives. +- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # This shell has a builtin print -r that does the trick. +- echo='print -r' +- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && +- test "X$CONFIG_SHELL" != X/bin/ksh; then +- # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +- export ORIGINAL_CONFIG_SHELL +- CONFIG_SHELL=/bin/ksh +- export CONFIG_SHELL +- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} +- else +- # Try using printf. +- echo='printf %s\n' +- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # Cool, printf works +- : +- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ ++ if test "X$ECHO" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ ECHO='print -r' ++ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} ++ else ++ # Try using printf. ++ ECHO='printf %s\n' ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then +- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL +- export CONFIG_SHELL +- SHELL="$CONFIG_SHELL" +- export SHELL +- echo="$CONFIG_SHELL $0 --fallback-echo" +- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$CONFIG_SHELL $0 --fallback-echo" +- else +- # maybe with a smaller string... +- prev=: +- +- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do +- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null +- then +- break ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ ECHO="$CONFIG_SHELL $0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$CONFIG_SHELL $0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: ++ ++ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do ++ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done ++ ++ if test "$prev" != 'sed 50q "$0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ ECHO=echo + fi +- prev="$cmd" +- done +- +- if test "$prev" != 'sed 50q "$0"'; then +- echo_test_string=`eval $prev` +- export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} +- else +- # Oops. We lost completely, so just stick with echo. +- echo=echo +- fi +- fi +- fi +- fi +-fi ++ fi ++ fi ++ fi ++ fi + fi + + # Copy echo and quote the copy suitably for passing to libtool from + # the Makefile, instead of quoting the original, which is used later. +-ECHO=$echo +-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then +- ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" +-fi +- +- +- +- +-tagnames=${tagnames+${tagnames},}CXX +- +-tagnames=${tagnames+${tagnames},}F77 ++lt_ECHO=$ECHO ++if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then ++ lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" ++fi ++ ++ ++ ++ ++test -n "$DJDIR" || exec 7<&0 &1 + + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +-exec 6>&1 +- + # + # Initializations. + # + ac_default_prefix=/usr/local ++ac_clean_files= + ac_config_libobj_dir=. ++LIBOBJS= + cross_compiling=no + subdirs= + MFLAGS= + MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} +- +-# Maximum number of lines to put in a shell here document. +-# This variable seems obsolete. It should probably be removed, and +-# only ac_max_sed_lines should be used. +-: ${ac_max_here_lines=38} + + # Identity of this package. + PACKAGE_NAME='blcr' +@@ -452,51 +730,321 @@ + PACKAGE_VERSION='0.8.2' + PACKAGE_STRING='blcr 0.8.2' + PACKAGE_BUGREPORT='http://ftg.lbl.gov/checkpoint' ++PACKAGE_URL='' + + ac_unique_file="cr_module/cr_module.c" + # Factoring default headers for most tests. + ac_includes_default="\ + #include +-#if HAVE_SYS_TYPES_H ++#ifdef HAVE_SYS_TYPES_H + # include + #endif +-#if HAVE_SYS_STAT_H ++#ifdef HAVE_SYS_STAT_H + # include + #endif +-#if STDC_HEADERS ++#ifdef STDC_HEADERS + # include + # include + #else +-# if HAVE_STDLIB_H ++# ifdef HAVE_STDLIB_H + # include + # endif + #endif +-#if HAVE_STRING_H +-# if !STDC_HEADERS && HAVE_MEMORY_H ++#ifdef HAVE_STRING_H ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H + # include + # endif + # include + #endif +-#if HAVE_STRINGS_H ++#ifdef HAVE_STRINGS_H + # include + #endif +-#if HAVE_INTTYPES_H ++#ifdef HAVE_INTTYPES_H + # include +-#else +-# if HAVE_STDINT_H +-# include +-# endif + #endif +-#if HAVE_UNISTD_H ++#ifdef HAVE_STDINT_H ++# include ++#endif ++#ifdef HAVE_UNISTD_H + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CR_RELEASE_MAJOR CR_RELEASE_MINOR CR_RELEASE_PATCH CR_RELEASE_VERSION LIBCR_MAJOR LIBCR_MINOR LIBCR_PATCH LIBCR_VERSION CR_MODULE_MAJOR CR_MODULE_MINOR CR_MODULE_PATCH CR_MODULE_VERSION LIBTOOL_INTERFACE LIBTOOL_AGE LIBTOOL_REVISION CONFIGURE_ARGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot PWD_PROG TOP_BUILDDIR TOP_SRCDIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os CR_ARCH CR_CPU CRI_DEBUG_TRUE CRI_DEBUG_FALSE CR_NDEBUG LIBCR_TRACING_TRUE LIBCR_TRACING_FALSE CR_KERNEL_TRACING_TRUE CR_KERNEL_TRACING_FALSE CR_BUILD_ETC_TRUE CR_BUILD_ETC_FALSE CR_INSTALLED_LIBCR_TRUE CR_INSTALLED_LIBCR_FALSE CR_INSTALLED_UTIL_TRUE CR_INSTALLED_UTIL_FALSE CR_BUILD_TESTSUITE_TRUE CR_BUILD_TESTSUITE_FALSE PERL MAKE RPMBUILD KCC RANLIB ac_ct_RANLIB LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP ECHO AR ac_ct_AR CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CR_ENABLE_STATIC_TRUE CR_ENABLE_STATIC_FALSE CR_ENABLE_SHARED_TRUE CR_ENABLE_SHARED_FALSE HAVE_RPMBUILD_TRUE HAVE_RPMBUILD_FALSE CR_LIBCR_CFLAGS CR_CLIENT_LDADD CR_FTB_INCLUDES CR_FTB_LDFLAGS CR_FTB_LDADD CR_SIGNUM CR_LIBARCH CR_BUILD_LIBCR32_TRUE CR_BUILD_LIBCR32_FALSE NM LINUX_SRC LINUX_OBJ LINUX_VER CR_KERNEL CR_KERNEL_BASE CR_MODULE_DIR KBUILD_MAKE_ARGS LINUX_SYMTAB_FILE LINUX_SYMTAB_CMD LINUX_SYMTAB_CONF CR_HAVE_SYSTEM_MAP_TRUE CR_HAVE_SYSTEM_MAP_FALSE CR_BUILD_MAN_TRUE CR_BUILD_MAN_FALSE CR_HAVE_FTB_TRUE CR_HAVE_FTB_FALSE CR_HAVE_CXX_TRUE CR_HAVE_CXX_FALSE GMAKE_IFEQ GMAKE_IFNEQ GMAKE_ELSE GMAKE_ENDIF KBUILD_MAK BUILD_CR_INFO_TRUE BUILD_CR_INFO_FALSE BUILD_VMADLIB_TRUE BUILD_VMADLIB_FALSE CR_BUILD_MODULES_TRUE CR_BUILD_MODULES_FALSE CR_BUILD_UTIL_TRUE CR_BUILD_UTIL_FALSE CR_BUILD_LIBCR_TRUE CR_BUILD_LIBCR_FALSE CR_BUILD_INCLUDE_TRUE CR_BUILD_INCLUDE_FALSE CR_BUILD_TESTS_TRUE CR_BUILD_TESTS_FALSE CR_BUILD_EXAMPLES_TRUE CR_BUILD_EXAMPLES_FALSE CR_BUILD_CONTRIB_TRUE CR_BUILD_CONTRIB_FALSE LIBOBJS LTLIBOBJS' +-ac_subst_files='CR_KSYM_IMPORT_DECLS CR_KSYM_IMPORT_CALLS' ++ac_subst_vars='am__EXEEXT_FALSE ++am__EXEEXT_TRUE ++LTLIBOBJS ++LIBOBJS ++CR_BUILD_CONTRIB_FALSE ++CR_BUILD_CONTRIB_TRUE ++CR_BUILD_EXAMPLES_FALSE ++CR_BUILD_EXAMPLES_TRUE ++CR_BUILD_TESTS_FALSE ++CR_BUILD_TESTS_TRUE ++CR_BUILD_INCLUDE_FALSE ++CR_BUILD_INCLUDE_TRUE ++CR_BUILD_LIBCR_FALSE ++CR_BUILD_LIBCR_TRUE ++CR_BUILD_UTIL_FALSE ++CR_BUILD_UTIL_TRUE ++CR_BUILD_MODULES_FALSE ++CR_BUILD_MODULES_TRUE ++BUILD_VMADLIB_FALSE ++BUILD_VMADLIB_TRUE ++BUILD_CR_INFO_FALSE ++BUILD_CR_INFO_TRUE ++KBUILD_MAK ++GMAKE_ENDIF ++GMAKE_ELSE ++GMAKE_IFNEQ ++GMAKE_IFEQ ++CR_HAVE_CXX_FALSE ++CR_HAVE_CXX_TRUE ++CR_HAVE_FTB_FALSE ++CR_HAVE_FTB_TRUE ++CR_BUILD_MAN_FALSE ++CR_BUILD_MAN_TRUE ++CR_HAVE_SYSTEM_MAP_FALSE ++CR_HAVE_SYSTEM_MAP_TRUE ++CR_KARCH ++LINUX_SYMTAB_CONF ++LINUX_SYMTAB_CMD ++LINUX_SYMTAB_FILE ++KBUILD_MAKE_ARGS ++CR_MODULE_DIR ++CR_KERNEL_BASE ++CR_KERNEL ++LINUX_VER ++LINUX_OBJ ++LINUX_SRC ++CR_BUILD_LIBCR32_FALSE ++CR_BUILD_LIBCR32_TRUE ++CR_LIBARCH ++CR_SIGNUM ++CR_FTB_LDADD ++CR_FTB_LDFLAGS ++CR_FTB_INCLUDES ++CXXCPP ++am__fastdepCXX_FALSE ++am__fastdepCXX_TRUE ++CXXDEPMODE ++ac_ct_CXX ++CXXFLAGS ++CXX ++CR_CLIENT_LDADD ++CR_LIBCR_CFLAGS ++HAVE_RPMBUILD_FALSE ++HAVE_RPMBUILD_TRUE ++CR_ENABLE_SHARED_FALSE ++CR_ENABLE_SHARED_TRUE ++CR_ENABLE_STATIC_FALSE ++CR_ENABLE_STATIC_TRUE ++CPP ++OTOOL64 ++OTOOL ++LIPO ++NMEDIT ++DSYMUTIL ++lt_ECHO ++AR ++OBJDUMP ++NM ++ac_ct_DUMPBIN ++DUMPBIN ++LD ++FGREP ++EGREP ++GREP ++SED ++am__fastdepCC_FALSE ++am__fastdepCC_TRUE ++CCDEPMODE ++AMDEPBACKSLASH ++AMDEP_FALSE ++AMDEP_TRUE ++am__quote ++am__include ++DEPDIR ++OBJEXT ++EXEEXT ++ac_ct_CC ++CPPFLAGS ++LDFLAGS ++CFLAGS ++CC ++LIBTOOL ++LN_S ++RANLIB ++KCC ++RPMBUILD ++MAKE ++PERL ++CR_BUILD_TESTSUITE_FALSE ++CR_BUILD_TESTSUITE_TRUE ++CR_INSTALLED_UTIL_FALSE ++CR_INSTALLED_UTIL_TRUE ++CR_INSTALLED_LIBCR_FALSE ++CR_INSTALLED_LIBCR_TRUE ++CR_BUILD_ETC_FALSE ++CR_BUILD_ETC_TRUE ++CR_KERNEL_TRACING_FALSE ++CR_KERNEL_TRACING_TRUE ++LIBCR_TRACING_FALSE ++LIBCR_TRACING_TRUE ++CR_NDEBUG ++CRI_DEBUG_FALSE ++CRI_DEBUG_TRUE ++CR_CPU ++CR_ARCH ++host_os ++host_vendor ++host_cpu ++host ++build_os ++build_vendor ++build_cpu ++build ++TOP_SRCDIR ++TOP_BUILDDIR ++PWD_PROG ++MAINT ++MAINTAINER_MODE_FALSE ++MAINTAINER_MODE_TRUE ++am__untar ++am__tar ++AMTAR ++am__leading_dot ++SET_MAKE ++AWK ++mkdir_p ++MKDIR_P ++INSTALL_STRIP_PROGRAM ++STRIP ++install_sh ++MAKEINFO ++AUTOHEADER ++AUTOMAKE ++AUTOCONF ++ACLOCAL ++VERSION ++PACKAGE ++CYGPATH_W ++am__isrc ++INSTALL_DATA ++INSTALL_SCRIPT ++INSTALL_PROGRAM ++CONFIGURE_ARGS ++LIBTOOL_REVISION ++LIBTOOL_AGE ++LIBTOOL_INTERFACE ++CR_MODULE_VERSION ++CR_MODULE_PATCH ++CR_MODULE_MINOR ++CR_MODULE_MAJOR ++LIBCR_VERSION ++LIBCR_PATCH ++LIBCR_MINOR ++LIBCR_MAJOR ++CR_RELEASE_VERSION ++CR_RELEASE_PATCH ++CR_RELEASE_MINOR ++CR_RELEASE_MAJOR ++target_alias ++host_alias ++build_alias ++LIBS ++ECHO_T ++ECHO_N ++ECHO_C ++DEFS ++mandir ++localedir ++libdir ++psdir ++pdfdir ++dvidir ++htmldir ++infodir ++docdir ++oldincludedir ++includedir ++localstatedir ++sharedstatedir ++sysconfdir ++datadir ++datarootdir ++libexecdir ++sbindir ++bindir ++program_transform_name ++prefix ++exec_prefix ++PACKAGE_URL ++PACKAGE_BUGREPORT ++PACKAGE_STRING ++PACKAGE_VERSION ++PACKAGE_TARNAME ++PACKAGE_NAME ++PATH_SEPARATOR ++SHELL' ++ac_subst_files='CR_KSYM_IMPORT_DECLS ++CR_KSYM_IMPORT_CALLS' ++ac_user_opts=' ++enable_option_checking ++enable_maintainer_mode ++with_components ++with_linux ++with_linux_src ++with_system_map ++with_vmlinux ++with_kmod_dir ++with_kernel_type ++enable_config_report ++enable_kbuild_verbose ++enable_debug ++enable_libcr_tracing ++enable_kernel_tracing ++enable_multilib ++enable_init_script ++enable_restore_ids ++with_installed_libcr ++with_installed_util ++with_installed_modules ++enable_testsuite ++enable_all_static ++enable_cr_info ++with_ftb ++with_bug2524 ++enable_static ++enable_shared ++with_pic ++enable_fast_install ++enable_dependency_tracking ++with_gnu_ld ++enable_libtool_lock ++' ++ ac_precious_vars='build_alias ++host_alias ++target_alias ++PERL ++MAKE ++RPMBUILD ++KCC ++CC ++CFLAGS ++LDFLAGS ++LIBS ++CPPFLAGS ++CPP ++CXX ++CXXFLAGS ++CCC ++CXXCPP' ++ + + # Initialize some variables set by options. + ac_init_help= + ac_init_version=false ++ac_unrecognized_opts= ++ac_unrecognized_sep= + # The variables have the same names as the options, with + # dashes changed to underlines. + cache_file=/dev/null +@@ -519,34 +1067,48 @@ + # and all the variables that are supposed to be based on exec_prefix + # by default will actually change. + # Use braces instead of parens because sh, perl, etc. also accept them. ++# (The list follows the same order as the GNU Coding Standards.) + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +-datadir='${prefix}/share' ++datarootdir='${prefix}/share' ++datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' +-libdir='${exec_prefix}/lib' + includedir='${prefix}/include' + oldincludedir='/usr/include' +-infodir='${prefix}/info' +-mandir='${prefix}/man' ++docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' ++infodir='${datarootdir}/info' ++htmldir='${docdir}' ++dvidir='${docdir}' ++pdfdir='${docdir}' ++psdir='${docdir}' ++libdir='${exec_prefix}/lib' ++localedir='${datarootdir}/locale' ++mandir='${datarootdir}/man' + + ac_prev= ++ac_dashdash= + for ac_option + do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then +- eval "$ac_prev=\$ac_option" ++ eval $ac_prev=\$ac_option + ac_prev= + continue + fi + +- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` ++ case $ac_option in ++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *) ac_optarg=yes ;; ++ esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + +- case $ac_option in ++ case $ac_dashdash$ac_option in ++ --) ++ ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; +@@ -568,33 +1130,59 @@ + --config-cache | -C) + cache_file=config.cache ;; + +- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ++ -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; +- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ +- | --da=*) ++ -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + ++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ ++ | --dataroo | --dataro | --datar) ++ ac_prev=datarootdir ;; ++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ ++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) ++ datarootdir=$ac_optarg ;; ++ + -disable-* | --disable-*) +- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 +- { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` +- eval "enable_$ac_feature=no" ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error "invalid feature name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=no ;; ++ ++ -docdir | --docdir | --docdi | --doc | --do) ++ ac_prev=docdir ;; ++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) ++ docdir=$ac_optarg ;; ++ ++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) ++ ac_prev=dvidir ;; ++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) ++ dvidir=$ac_optarg ;; + + -enable-* | --enable-*) +- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 +- { (exit 1); exit 1; }; } +- ac_feature=`echo $ac_feature | sed 's/-/_/g'` +- case $ac_option in +- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; +- *) ac_optarg=yes ;; +- esac +- eval "enable_$ac_feature='$ac_optarg'" ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error "invalid feature name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -621,6 +1209,12 @@ + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + ++ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) ++ ac_prev=htmldir ;; ++ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ ++ | --ht=*) ++ htmldir=$ac_optarg ;; ++ + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; +@@ -645,13 +1239,16 @@ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + ++ -localedir | --localedir | --localedi | --localed | --locale) ++ ac_prev=localedir ;; ++ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) ++ localedir=$ac_optarg ;; ++ + -localstatedir | --localstatedir | --localstatedi | --localstated \ +- | --localstate | --localstat | --localsta | --localst \ +- | --locals | --local | --loca | --loc | --lo) ++ | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ +- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ +- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) ++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) +@@ -716,6 +1313,16 @@ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + ++ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) ++ ac_prev=pdfdir ;; ++ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) ++ pdfdir=$ac_optarg ;; ++ ++ -psdir | --psdir | --psdi | --psd | --ps) ++ ac_prev=psdir ;; ++ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) ++ psdir=$ac_optarg ;; ++ + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; +@@ -766,26 +1373,36 @@ + ac_init_version=: ;; + + -with-* | --with-*) +- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid package name: $ac_package" >&2 +- { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package| sed 's/-/_/g'` +- case $ac_option in +- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; +- *) ac_optarg=yes ;; +- esac +- eval "with_$ac_package='$ac_optarg'" ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error "invalid package name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) +- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` ++ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid package name: $ac_package" >&2 +- { (exit 1); exit 1; }; } +- ac_package=`echo $ac_package | sed 's/-/_/g'` +- eval "with_$ac_package=no" ;; ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error "invalid package name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. +@@ -805,26 +1422,25 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) { echo "$as_me: error: unrecognized option: $ac_option +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ++ -*) as_fn_error "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information." + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. +- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && +- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 +- { (exit 1); exit 1; }; } +- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` +- eval "$ac_envvar='$ac_optarg'" ++ case $ac_envvar in #( ++ '' | [0-9]* | *[!_$as_cr_alnum]* ) ++ as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ esac ++ eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. +- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 ++ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + +@@ -833,31 +1449,36 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { echo "$as_me: error: missing argument to $ac_option" >&2 +- { (exit 1); exit 1; }; } +-fi +- +-# Be sure to have absolute paths. +-for ac_var in exec_prefix prefix +-do +- eval ac_val=$`echo $ac_var` ++ as_fn_error "missing argument to $ac_option" ++fi ++ ++if test -n "$ac_unrecognized_opts"; then ++ case $enable_option_checking in ++ no) ;; ++ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; ++ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; ++ esac ++fi ++ ++# Check all directory arguments for consistency. ++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ ++ datadir sysconfdir sharedstatedir localstatedir includedir \ ++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ ++ libdir localedir mandir ++do ++ eval ac_val=\$$ac_var ++ # Remove trailing slashes. + case $ac_val in +- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; +- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; };; +- esac +-done +- +-# Be sure to have absolute paths. +-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ +- localstatedir libdir includedir oldincludedir infodir mandir +-do +- eval ac_val=$`echo $ac_var` ++ */ ) ++ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` ++ eval $ac_var=\$ac_val;; ++ esac ++ # Be sure to have absolute directory names. + case $ac_val in +- [\\/$]* | ?:[\\/]* ) ;; +- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; };; +- esac ++ [\\/$]* | ?:[\\/]* ) continue;; ++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; ++ esac ++ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -871,7 +1492,7 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. ++ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes +@@ -884,110 +1505,72 @@ + test "$silent" = yes && exec 6>/dev/null + + ++ac_pwd=`pwd` && test -n "$ac_pwd" && ++ac_ls_di=`ls -di .` && ++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || ++ as_fn_error "working directory cannot be determined" ++test "X$ac_ls_di" = "X$ac_pwd_ls_di" || ++ as_fn_error "pwd does not report name of working directory" ++ ++ + # Find the source files, if location was not specified. + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes +- # Try the directory containing this script, then its parent. +- ac_confdir=`(dirname "$0") 2>/dev/null || +-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$0" : 'X\(//\)[^/]' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$0" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ # Try the directory containing this script, then the parent directory. ++ ac_confdir=`$as_dirname -- "$as_myself" || ++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_myself" : 'X\(//\)[^/]' \| \ ++ X"$as_myself" : 'X\(//\)$' \| \ ++ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_myself" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + srcdir=$ac_confdir +- if test ! -r $srcdir/$ac_unique_file; then ++ if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi + else + ac_srcdir_defaulted=no + fi +-if test ! -r $srcdir/$ac_unique_file; then +- if test "$ac_srcdir_defaulted" = yes; then +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 +- { (exit 1); exit 1; }; } +- else +- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +- { (exit 1); exit 1; }; } +- fi +-fi +-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || +- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 +- { (exit 1); exit 1; }; } +-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +-ac_env_build_alias_set=${build_alias+set} +-ac_env_build_alias_value=$build_alias +-ac_cv_env_build_alias_set=${build_alias+set} +-ac_cv_env_build_alias_value=$build_alias +-ac_env_host_alias_set=${host_alias+set} +-ac_env_host_alias_value=$host_alias +-ac_cv_env_host_alias_set=${host_alias+set} +-ac_cv_env_host_alias_value=$host_alias +-ac_env_target_alias_set=${target_alias+set} +-ac_env_target_alias_value=$target_alias +-ac_cv_env_target_alias_set=${target_alias+set} +-ac_cv_env_target_alias_value=$target_alias +-ac_env_PERL_set=${PERL+set} +-ac_env_PERL_value=$PERL +-ac_cv_env_PERL_set=${PERL+set} +-ac_cv_env_PERL_value=$PERL +-ac_env_MAKE_set=${MAKE+set} +-ac_env_MAKE_value=$MAKE +-ac_cv_env_MAKE_set=${MAKE+set} +-ac_cv_env_MAKE_value=$MAKE +-ac_env_RPMBUILD_set=${RPMBUILD+set} +-ac_env_RPMBUILD_value=$RPMBUILD +-ac_cv_env_RPMBUILD_set=${RPMBUILD+set} +-ac_cv_env_RPMBUILD_value=$RPMBUILD +-ac_env_KCC_set=${KCC+set} +-ac_env_KCC_value=$KCC +-ac_cv_env_KCC_set=${KCC+set} +-ac_cv_env_KCC_value=$KCC +-ac_env_CC_set=${CC+set} +-ac_env_CC_value=$CC +-ac_cv_env_CC_set=${CC+set} +-ac_cv_env_CC_value=$CC +-ac_env_CFLAGS_set=${CFLAGS+set} +-ac_env_CFLAGS_value=$CFLAGS +-ac_cv_env_CFLAGS_set=${CFLAGS+set} +-ac_cv_env_CFLAGS_value=$CFLAGS +-ac_env_LDFLAGS_set=${LDFLAGS+set} +-ac_env_LDFLAGS_value=$LDFLAGS +-ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +-ac_cv_env_LDFLAGS_value=$LDFLAGS +-ac_env_CPPFLAGS_set=${CPPFLAGS+set} +-ac_env_CPPFLAGS_value=$CPPFLAGS +-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +-ac_cv_env_CPPFLAGS_value=$CPPFLAGS +-ac_env_CPP_set=${CPP+set} +-ac_env_CPP_value=$CPP +-ac_cv_env_CPP_set=${CPP+set} +-ac_cv_env_CPP_value=$CPP +-ac_env_CXX_set=${CXX+set} +-ac_env_CXX_value=$CXX +-ac_cv_env_CXX_set=${CXX+set} +-ac_cv_env_CXX_value=$CXX +-ac_env_CXXFLAGS_set=${CXXFLAGS+set} +-ac_env_CXXFLAGS_value=$CXXFLAGS +-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} +-ac_cv_env_CXXFLAGS_value=$CXXFLAGS +-ac_env_CXXCPP_set=${CXXCPP+set} +-ac_env_CXXCPP_value=$CXXCPP +-ac_cv_env_CXXCPP_set=${CXXCPP+set} +-ac_cv_env_CXXCPP_value=$CXXCPP +-ac_env_F77_set=${F77+set} +-ac_env_F77_value=$F77 +-ac_cv_env_F77_set=${F77+set} +-ac_cv_env_F77_value=$F77 +-ac_env_FFLAGS_set=${FFLAGS+set} +-ac_env_FFLAGS_value=$FFLAGS +-ac_cv_env_FFLAGS_set=${FFLAGS+set} +-ac_cv_env_FFLAGS_value=$FFLAGS ++if test ! -r "$srcdir/$ac_unique_file"; then ++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." ++ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" ++fi ++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ++ac_abs_confdir=`( ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" ++ pwd)` ++# When building in place, set srcdir=. ++if test "$ac_abs_confdir" = "$ac_pwd"; then ++ srcdir=. ++fi ++# Remove unnecessary trailing slashes from srcdir. ++# Double slashes in file names in object file debugging info ++# mess up M-x gdb in Emacs. ++case $srcdir in ++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; ++esac ++for ac_var in $ac_precious_vars; do ++ eval ac_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_env_${ac_var}_value=\$${ac_var} ++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_cv_env_${ac_var}_value=\$${ac_var} ++done + + # + # Report the --help message. +@@ -1016,14 +1599,11 @@ + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +-_ACEOF +- +- cat <<_ACEOF + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] ++ [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [PREFIX] ++ [PREFIX] + + By default, \`make install' will install all the files in + \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +@@ -1033,18 +1613,25 @@ + For better control, use the options below. + + Fine tuning of the installation directories: +- --bindir=DIR user executables [EPREFIX/bin] +- --sbindir=DIR system admin executables [EPREFIX/sbin] +- --libexecdir=DIR program executables [EPREFIX/libexec] +- --datadir=DIR read-only architecture-independent data [PREFIX/share] +- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] +- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] +- --localstatedir=DIR modifiable single-machine data [PREFIX/var] +- --libdir=DIR object code libraries [EPREFIX/lib] +- --includedir=DIR C header files [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --infodir=DIR info documentation [PREFIX/info] +- --mandir=DIR man documentation [PREFIX/man] ++ --bindir=DIR user executables [EPREFIX/bin] ++ --sbindir=DIR system admin executables [EPREFIX/sbin] ++ --libexecdir=DIR program executables [EPREFIX/libexec] ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --libdir=DIR object code libraries [EPREFIX/lib] ++ --includedir=DIR C header files [PREFIX/include] ++ --oldincludedir=DIR C header files for non-gcc [/usr/include] ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] ++ --mandir=DIR man documentation [DATAROOTDIR/man] ++ --docdir=DIR documentation root [DATAROOTDIR/doc/blcr] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] + _ACEOF + + cat <<\_ACEOF +@@ -1067,8 +1654,11 @@ + cat <<\_ACEOF + + Optional Features: ++ --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --disable-maintainer-mode disable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer + --enable-config-report enable report at the conclusion of the configure + script (default is yes) + --enable-kbuild-verbose enable verbose output from the kbuild facility. +@@ -1092,10 +1682,8 @@ + examples) with -static flag (default is no) + --enable-cr-info build cr_info utility (default is no, because this + is currently broken) +- --enable-static[=PKGS] +- build static libraries [default=no] +- --enable-shared[=PKGS] +- build shared libraries [default=yes] ++ --enable-static[=PKGS] build static libraries [default=no] ++ --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-dependency-tracking speeds up one-time build +@@ -1133,11 +1721,9 @@ + (default /usr/local/ftb) + --with-bug2524 request that blcr use a work around for bug 2524 + (ppc specific) +- --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-pic try to use only PIC/non-PIC objects [default=use + both] +- --with-tags[=TAGS] +- include additional configurations [automatic] ++ --with-gnu-ld assume the C compiler uses GNU ld [default=no] + + Some influential environment variables: + PERL perl interpreter (required: for configure, build and testsuite) +@@ -1148,118 +1734,84 @@ + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory +- CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have +- headers in a nonstandard directory ++ LIBS libraries to pass to the linker, e.g. -l ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if ++ you have headers in a nonstandard directory + CPP C preprocessor + CXX C++ compiler command + CXXFLAGS C++ compiler flags + CXXCPP C++ preprocessor +- F77 Fortran 77 compiler command +- FFLAGS Fortran 77 compiler flags + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. + + Report bugs to . + _ACEOF ++ac_status=$? + fi + + if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. +- ac_popdir=`pwd` + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d $ac_dir || continue ++ test -d "$ac_dir" || ++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || ++ continue + ac_builddir=. + +-if test "$ac_dir" != .; then +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A "../" for each directory in $ac_dir_suffix. +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +-else +- ac_dir_suffix= ac_top_builddir= +-fi ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix + + case $srcdir in +- .) # No --srcdir option. We are building in place. ++ .) # We are building in place. + ac_srcdir=. +- if test -z "$ac_top_builddir"; then +- ac_top_srcdir=. +- else +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +- fi ;; +- [\\/]* | ?:[\\/]* ) # Absolute path. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir ;; +- *) # Relative path. +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_builddir$srcdir ;; +-esac +- +-# Do not use `cd foo && pwd` to compute absolute paths, because +-# the directories may not exist. +-case `pwd` in +-.) ac_abs_builddir="$ac_dir";; +-*) +- case "$ac_dir" in +- .) ac_abs_builddir=`pwd`;; +- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +- *) ac_abs_builddir=`pwd`/"$ac_dir";; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_builddir=${ac_top_builddir}.;; +-*) +- case ${ac_top_builddir}. in +- .) ac_abs_top_builddir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_srcdir=$ac_srcdir;; +-*) +- case $ac_srcdir in +- .) ac_abs_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_srcdir=$ac_top_srcdir;; +-*) +- case $ac_top_srcdir in +- .) ac_abs_top_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +- esac;; +-esac +- +- cd $ac_dir +- # Check for guested configure; otherwise get Cygnus style configure. +- if test -f $ac_srcdir/configure.gnu; then +- echo +- $SHELL $ac_srcdir/configure.gnu --help=recursive +- elif test -f $ac_srcdir/configure; then +- echo +- $SHELL $ac_srcdir/configure --help=recursive +- elif test -f $ac_srcdir/configure.ac || +- test -f $ac_srcdir/configure.in; then +- echo +- $ac_configure --help +- else +- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 +- fi +- cd $ac_popdir +- done +-fi +- +-test -n "$ac_init_help" && exit 0 ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; ++esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ++ ++ cd "$ac_dir" || { ac_status=$?; continue; } ++ # Check for guested configure. ++ if test -f "$ac_srcdir/configure.gnu"; then ++ echo && ++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive ++ elif test -f "$ac_srcdir/configure"; then ++ echo && ++ $SHELL "$ac_srcdir/configure" --help=recursive ++ else ++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ++ fi || ac_status=$? ++ cd "$ac_pwd" || { ac_status=$?; break; } ++ done ++fi ++ ++test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF + blcr configure 0.8.2 +-generated by GNU Autoconf 2.59 +- +-Copyright (C) 2003 Free Software Foundation, Inc. ++generated by GNU Autoconf 2.65 ++ ++Copyright (C) 2009 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + +@@ -1287,19 +1839,583 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + _ACEOF +- exit 0 +-fi +-exec 5>config.log +-cat >&5 <<_ACEOF ++ exit ++fi ++ ++## ------------------------ ## ++## Autoconf initialization. ## ++## ------------------------ ## ++ ++# ac_fn_c_try_compile LINENO ++# -------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_c_try_compile ++ ++# ac_fn_c_try_link LINENO ++# ----------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_c_try_link ++ ++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists and can be compiled using the include files in ++# INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_c_check_header_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_header_compile ++ ++# ac_fn_c_try_cpp LINENO ++# ---------------------- ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_c_try_cpp ++ ++# ac_fn_c_try_run LINENO ++# ---------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes ++# that executables *can* be run. ++ac_fn_c_try_run () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: program exited with status $ac_status" >&5 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=$ac_status ++fi ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_c_try_run ++ ++# ac_fn_c_check_func LINENO FUNC VAR ++# ---------------------------------- ++# Tests whether FUNC exists, setting the cache variable VAR accordingly ++ac_fn_c_check_func () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case declares $2. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $2 innocuous_$2 ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $2 (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $2 ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $2 (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$2 || defined __stub___$2 ++choke me ++#endif ++ ++int ++main () ++{ ++return $2 (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} # ac_fn_c_check_func ++ ++# ac_fn_cxx_try_compile LINENO ++# ---------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_cxx_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_cxx_try_compile ++ ++# ac_fn_cxx_try_cpp LINENO ++# ------------------------ ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_cxx_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_cxx_try_cpp ++ ++# ac_fn_cxx_try_link LINENO ++# ------------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_cxx_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_cxx_try_link ++ ++# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES ++# -------------------------------------------- ++# Tries to find the compile-time value of EXPR in a program that includes ++# INCLUDES, setting VAR accordingly. Returns whether the value could be ++# computed ++ac_fn_c_compute_int () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if test "$cross_compiling" = yes; then ++ # Depending upon the size, compute the lo and hi bounds. ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) >= 0)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_lo=0 ac_mid=0 ++ while :; do ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) <= $ac_mid)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_hi=$ac_mid; break ++else ++ as_fn_arith $ac_mid + 1 && ac_lo=$as_val ++ if test $ac_lo -le $ac_mid; then ++ ac_lo= ac_hi= ++ break ++ fi ++ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) < 0)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_hi=-1 ac_mid=-1 ++ while :; do ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) >= $ac_mid)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_lo=$ac_mid; break ++else ++ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val ++ if test $ac_mid -le $ac_hi; then ++ ac_lo= ac_hi= ++ break ++ fi ++ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ ac_lo= ac_hi= ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++# Binary search between lo and hi bounds. ++while test "x$ac_lo" != "x$ac_hi"; do ++ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) <= $ac_mid)]; ++test_array [0] = 0 ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_hi=$ac_mid ++else ++ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++done ++case $ac_lo in #(( ++?*) eval "$3=\$ac_lo"; ac_retval=0 ;; ++'') ac_retval=1 ;; ++esac ++ else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++static long int longval () { return $2; } ++static unsigned long int ulongval () { return $2; } ++#include ++#include ++int ++main () ++{ ++ ++ FILE *f = fopen ("conftest.val", "w"); ++ if (! f) ++ return 1; ++ if (($2) < 0) ++ { ++ long int i = longval (); ++ if (i != ($2)) ++ return 1; ++ fprintf (f, "%ld", i); ++ } ++ else ++ { ++ unsigned long int i = ulongval (); ++ if (i != ($2)) ++ return 1; ++ fprintf (f, "%lu", i); ++ } ++ /* Do not output a trailing newline, as this causes \r\n confusion ++ on some platforms. */ ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ echo >>conftest.val; read $3 config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by blcr $as_me 0.8.2, which was +-generated by GNU Autoconf 2.59. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + $ $0 $@ + + _ACEOF ++exec 5>>config.log + { + cat <<_ASUNAME + ## --------- ## +@@ -1318,7 +2434,7 @@ + /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` + /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` + /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +-hostinfo = `(hostinfo) 2>/dev/null || echo unknown` ++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` + /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` + /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` + /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +@@ -1330,8 +2446,9 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- echo "PATH: $as_dir" +-done ++ $as_echo "PATH: $as_dir" ++ done ++IFS=$as_save_IFS + + } >&5 + +@@ -1353,7 +2470,6 @@ + ac_configure_args= + ac_configure_args0= + ac_configure_args1= +-ac_sep= + ac_must_keep_next=false + for ac_pass in 1 2 + do +@@ -1364,13 +2480,13 @@ + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) +- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *\'*) ++ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in +- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ++ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) +- ac_configure_args1="$ac_configure_args1 '$ac_arg'" ++ as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else +@@ -1386,21 +2502,19 @@ + -* ) ac_must_keep_next=true ;; + esac + fi +- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" +- # Get rid of the leading space. +- ac_sep=" " +- ;; +- esac +- done +-done +-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++ as_fn_append ac_configure_args " '$ac_arg'" ++ ;; ++ esac ++ done ++done ++{ ac_configure_args0=; unset ac_configure_args0;} ++{ ac_configure_args1=; unset ac_configure_args1;} + + # When interrupted or exit'd, cleanup temporary files, and complete + # config.log. We remove comments because anyway the quotes in there + # would cause problems or look ugly. +-# WARNING: Be sure not to use single quotes in there, as some shells, +-# such as our DU 5.0 friend, will then `close' the trap. ++# WARNING: Use '\'' to represent an apostrophe within the trap. ++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. + trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { +@@ -1413,20 +2527,35 @@ + _ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done + (set) 2>&1 | +- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in +- *ac_space=\ *) ++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) + sed -n \ +- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" +- ;; +- *) +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} ++ "s/'\''/'\''\\\\'\'''\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" ++ ;; #( ++ *) ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) + echo + + cat <<\_ASBOX +@@ -1437,22 +2566,28 @@ + echo + for ac_var in $ac_subst_vars + do +- eval ac_val=$`echo $ac_var` +- echo "$ac_var='"'"'$ac_val'"'"'" ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +-## ------------- ## +-## Output files. ## +-## ------------- ## ++## ------------------- ## ++## File substitutions. ## ++## ------------------- ## + _ASBOX + echo + for ac_var in $ac_subst_files + do +- eval ac_val=$`echo $ac_var` +- echo "$ac_var='"'"'$ac_val'"'"'" ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi +@@ -1464,26 +2599,26 @@ + ## ----------- ## + _ASBOX + echo +- sed "/^$/d" confdefs.h | sort ++ cat confdefs.h + echo + fi + test "$ac_signal" != 0 && +- echo "$as_me: caught signal $ac_signal" +- echo "$as_me: exit $exit_status" ++ $as_echo "$as_me: caught signal $ac_signal" ++ $as_echo "$as_me: exit $exit_status" + } >&5 +- rm -f core *.core && +- rm -rf conftest* confdefs* conf$$* $ac_clean_files && ++ rm -f core *.core core.conftest.* && ++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +- ' 0 ++' 0 + for ac_signal in 1 2 13 15; do +- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal ++ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal + done + ac_signal=0 + + # confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -rf conftest* confdefs.h +-# AIX cpp loses on an empty file, so make sure it contains at least a newline. +-echo >confdefs.h ++rm -f -r conftest* confdefs.h ++ ++$as_echo "/* confdefs.h */" > confdefs.h + + # Predefined preprocessor variables. + +@@ -1491,112 +2626,128 @@ + #define PACKAGE_NAME "$PACKAGE_NAME" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_TARNAME "$PACKAGE_TARNAME" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_VERSION "$PACKAGE_VERSION" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_STRING "$PACKAGE_STRING" + _ACEOF + +- + cat >>confdefs.h <<_ACEOF + #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" + _ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_URL "$PACKAGE_URL" ++_ACEOF ++ + + # Let the site file select an alternate cache file if it wants to. +-# Prefer explicitly selected file to automatically selected ones. +-if test -z "$CONFIG_SITE"; then +- if test "x$prefix" != xNONE; then +- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" +- else +- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +- fi +-fi +-for ac_site_file in $CONFIG_SITE; do +- if test -r "$ac_site_file"; then +- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +-echo "$as_me: loading site script $ac_site_file" >&6;} ++# Prefer an explicitly selected file to automatically selected ones. ++ac_site_file1=NONE ++ac_site_file2=NONE ++if test -n "$CONFIG_SITE"; then ++ ac_site_file1=$CONFIG_SITE ++elif test "x$prefix" != xNONE; then ++ ac_site_file1=$prefix/share/config.site ++ ac_site_file2=$prefix/etc/config.site ++else ++ ac_site_file1=$ac_default_prefix/share/config.site ++ ac_site_file2=$ac_default_prefix/etc/config.site ++fi ++for ac_site_file in "$ac_site_file1" "$ac_site_file2" ++do ++ test "x$ac_site_file" = xNONE && continue ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 ++$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi + done + + if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then +- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +-echo "$as_me: loading cache $cache_file" >&6;} ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 ++$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in +- [\\/]* | ?:[\\/]* ) . $cache_file;; +- *) . ./$cache_file;; +- esac +- fi +-else +- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +-echo "$as_me: creating cache $cache_file" >&6;} ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; ++ *) . "./$cache_file";; ++ esac ++ fi ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 ++$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi + + # Check that the precious variables saved in the cache have kept the same + # value. + ac_cache_corrupted=false +-for ac_var in `(set) 2>&1 | +- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do ++for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set +- eval ac_old_val="\$ac_cv_env_${ac_var}_value" +- eval ac_new_val="\$ac_env_${ac_var}_value" ++ eval ac_old_val=\$ac_cv_env_${ac_var}_value ++ eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) +- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then +- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +-echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +-echo "$as_me: current value: $ac_new_val" >&2;} +- ac_cache_corrupted=: ++ # differences in whitespace do not lead to failure. ++ ac_old_val_w=`echo x $ac_old_val` ++ ac_new_val_w=`echo x $ac_new_val` ++ if test "$ac_old_val_w" != "$ac_new_val_w"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 ++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ ac_cache_corrupted=: ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 ++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} ++ eval $ac_var=\$ac_old_val ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 ++$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 ++$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) +- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; ++ *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi + done + if $ac_cache_corrupted; then +- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +-echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} +- { (exit 1); exit 1; }; } +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 ++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++fi ++## -------------------- ## ++## Main body of script. ## ++## -------------------- ## + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -1606,31 +2757,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + # 2. Library version: + # ------------------- + # Determines which versions of the library are compatible with one another. +@@ -1700,31 +2826,30 @@ + ### rest of init setup + + ac_aux_dir= +-for ac_dir in ./config $srcdir/./config; do +- if test -f $ac_dir/install-sh; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install-sh -c" +- break +- elif test -f $ac_dir/install.sh; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install.sh -c" +- break +- elif test -f $ac_dir/shtool; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/shtool install -c" +- break +- fi ++for ac_dir in ./config "$srcdir"/./config; do ++ for ac_t in install-sh install.sh shtool; do ++ if test -f "$ac_dir/$ac_t"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/$ac_t -c" ++ break 2 ++ fi ++ done + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ./config $srcdir/./config" >&5 +-echo "$as_me: error: cannot find install-sh or install.sh in ./config $srcdir/./config" >&2;} +- { (exit 1); exit 1; }; } +-fi +-ac_config_guess="$SHELL $ac_aux_dir/config.guess" +-ac_config_sub="$SHELL $ac_aux_dir/config.sub" +-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. +- +-am__api_version="1.8" ++ as_fn_error "cannot find install-sh, install.sh, or shtool in ./config \"$srcdir\"/./config" "$LINENO" 5 ++fi ++ ++# These three variables are undocumented and unsupported, ++# and are intended to be withdrawn in a future Autoconf release. ++# They can cause serious problems if a builder's source tree is in a directory ++# whose full name contains unusual characters. ++ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. ++ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ++ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ++ ++ ++am__api_version='1.11' ++ + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or + # incompatible versions: +@@ -1738,22 +2863,23 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 ++# Reject install programs that cannot install multiple files. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 ++$as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++if test "${ac_cv_path_install+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- # Account for people who put trailing slashes in PATH elements. +-case $as_dir/ in +- ./ | .// | /cC/* | \ ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in #(( ++ ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ ++ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. +@@ -1761,7 +2887,7 @@ + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. +@@ -1771,30 +2897,43 @@ + # program-specific install script used by HP pwplus--don't use. + : + else +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 ++ rm -rf conftest.one conftest.two conftest.dir ++ echo one > conftest.one ++ echo two > conftest.two ++ mkdir conftest.dir ++ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && ++ test -s conftest.one && test -s conftest.two && ++ test -s conftest.dir/conftest.one && ++ test -s conftest.dir/conftest.two ++ then ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi + fi + fi + done + done + ;; + esac +-done +- ++ ++ done ++IFS=$as_save_IFS ++ ++rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else +- # As a last resort, use the slow shell script. We don't cache a +- # path for INSTALL within a source directory, because that will ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is +- # removed, or if the path is relative. ++ # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:$LINENO: result: $INSTALL" >&5 +-echo "${ECHO_T}$INSTALL" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 ++$as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -1804,21 +2943,34 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 ++$as_echo_n "checking whether build environment is sane... " >&6; } + # Just in case + sleep 1 + echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[\\\"\#\$\&\'\`$am_lf]*) ++ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; ++esac ++case $srcdir in ++ *[\\\"\#\$\&\'\`$am_lf\ \ ]*) ++ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; ++esac ++ + # Do `set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). + if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` ++ set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ +@@ -1828,11 +2980,8 @@ + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". +- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&5 +-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "ls -t appears to fail. Make sure there is not a broken ++alias in your environment" "$LINENO" 5 + fi + + test "$2" = conftest.file +@@ -1841,195 +2990,49 @@ + # Ok. + : + else +- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! +-Check your system clock" >&5 +-echo "$as_me: error: newly created file is older than distributed files! +-Check your system clock" >&2;} +- { (exit 1); exit 1; }; } +-fi +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 ++ as_fn_error "newly created file is older than distributed files! ++Check your system clock" "$LINENO" 5 ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + test "$program_prefix" != NONE && +- program_transform_name="s,^,$program_prefix,;$program_transform_name" ++ program_transform_name="s&^&$program_prefix&;$program_transform_name" + # Use a double $ so make ignores it. + test "$program_suffix" != NONE && +- program_transform_name="s,\$,$program_suffix,;$program_transform_name" +-# Double any \ or $. echo might interpret backslashes. ++ program_transform_name="s&\$&$program_suffix&;$program_transform_name" ++# Double any \ or $. + # By default was `s,x,x', remove it if useless. +-cat <<\_ACEOF >conftest.sed +-s/[\\$]/&&/g;s/;s,x,x,$// +-_ACEOF +-program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +-rm conftest.sed ++ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' ++program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` + +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " + else + am_missing_run= +- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +-fi +- +-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # Keeping the `.' argument allows $(mkdir_p) to be used without +- # argument. Indeed, we sometimes output rules like +- # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. +- # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more +- # expensive solution, as it forces Make to start a sub-shell.) +- mkdir_p='mkdir -p -- .' +-else +- # On NextStep and OpenStep, the `mkdir' command does not +- # recognize any option. It will interpret all options as +- # directories to create, and then abort because `.' already +- # exists. +- for d in ./-p ./--version; +- do +- test -d $d && rmdir $d +- done +- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. +- if test -f "$ac_aux_dir/mkinstalldirs"; then +- mkdir_p='$(mkinstalldirs)' +- else +- mkdir_p='$(install_sh) -d' +- fi +-fi +- +-for ac_prog in gawk mawk nawk awk +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_AWK+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$AWK"; then +- ac_cv_prog_AWK="$AWK" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_AWK="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-AWK=$ac_cv_prog_AWK +-if test -n "$AWK"; then +- echo "$as_me:$LINENO: result: $AWK" >&5 +-echo "${ECHO_T}$AWK" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- test -n "$AWK" && break +-done +- +-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 +-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` +-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.make <<\_ACEOF +-all: +- @echo 'ac_maketemp="$(MAKE)"' +-_ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` +-if test -n "$ac_maketemp"; then +- eval ac_cv_prog_make_${ac_make}_set=yes +-else +- eval ac_cv_prog_make_${ac_make}_set=no +-fi +-rm -f conftest.make +-fi +-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- SET_MAKE= +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +- SET_MAKE="MAKE=${MAKE-make}" +-fi +- +-rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-rmdir .tst 2>/dev/null +- +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} +- { (exit 1); exit 1; }; } +-fi +- +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' +- else +- CYGPATH_W=echo +- fi +-fi +- +- +-# Define the identity of the package. +- PACKAGE='blcr' +- VERSION='0.8.2' +- +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE "$PACKAGE" +-_ACEOF +- +- +-cat >>confdefs.h <<_ACEOF +-#define VERSION "$VERSION" +-_ACEOF +- +-# Some tools Automake needs. +- +-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} +- +- +-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} +- +- +-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} +- +- +-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} +- +- +-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +- +- +-AMTAR=${AMTAR-"${am_missing_run}tar"} +- +-install_sh=${install_sh-"$am_aux_dir/install-sh"} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 ++$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} ++fi ++ ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi + + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right +@@ -2039,10 +3042,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_STRIP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +@@ -2052,35 +3055,37 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- echo "$as_me:$LINENO: result: $STRIP" >&5 +-echo "${ECHO_T}$STRIP" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ + + fi + if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +@@ -2090,38 +3095,259 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-echo "${ECHO_T}$ac_ct_STRIP" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- STRIP=$ac_ct_STRIP ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi + else + STRIP="$ac_cv_prog_STRIP" + fi + + fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 ++$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } ++if test -z "$MKDIR_P"; then ++ if test "${ac_cv_path_mkdir+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in mkdir gmkdir; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue ++ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( ++ 'mkdir (GNU coreutils) '* | \ ++ 'mkdir (coreutils) '* | \ ++ 'mkdir (fileutils) '4.1*) ++ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext ++ break 3;; ++ esac ++ done ++ done ++ done ++IFS=$as_save_IFS ++ ++fi ++ ++ test -d ./--version && rmdir ./--version ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ MKDIR_P="$ac_cv_path_mkdir -p" ++ else ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for MKDIR_P within a source directory, because that will ++ # break other packages using the cache if that directory is ++ # removed, or if the value is a relative name. ++ MKDIR_P="$ac_install_sh -d" ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 ++$as_echo "$MKDIR_P" >&6; } ++ ++mkdir_p="$MKDIR_P" ++case $mkdir_p in ++ [\\/$]* | ?:[\\/]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++ ++for ac_prog in gawk mawk nawk awk ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_AWK+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$AWK"; then ++ ac_cv_prog_AWK="$AWK" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_AWK="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++AWK=$ac_cv_prog_AWK ++if test -n "$AWK"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 ++$as_echo "$AWK" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$AWK" && break ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } ++set x ${MAKE-make} ++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat >conftest.make <<\_ACEOF ++SHELL = /bin/sh ++all: ++ @echo '@@@%%%=$(MAKE)=@@@%%%' ++_ACEOF ++# GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++case `${MAKE-make} -f conftest.make 2>/dev/null` in ++ *@@@%%%=?*=@@@%%%*) ++ eval ac_cv_prog_make_${ac_make}_set=yes;; ++ *) ++ eval ac_cv_prog_make_${ac_make}_set=no;; ++esac ++rm -f conftest.make ++fi ++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ SET_MAKE= ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ SET_MAKE="MAKE=${MAKE-make}" ++fi ++ ++rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++ ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ am__isrc=' -I$(srcdir)' ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 ++ fi ++fi ++ ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++ ++ ++# Define the identity of the package. ++ PACKAGE='blcr' ++ VERSION='0.8.2' ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE "$PACKAGE" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define VERSION "$VERSION" ++_ACEOF ++ ++# Some tools Automake needs. ++ ++ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} ++ ++ ++AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} ++ ++ ++AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} ++ ++ ++AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} ++ ++ ++MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +- ++# Always define AMTAR for backward compatibility. ++ ++AMTAR=${AMTAR-"${am_missing_run}tar"} ++ ++am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5 ++$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; } ++ # Check whether --enable-maintainer-mode was given. ++if test "${enable_maintainer_mode+set}" = set; then : ++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval ++else ++ USE_MAINTAINER_MODE=yes ++fi ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 ++$as_echo "$USE_MAINTAINER_MODE" >&6; } ++ if test $USE_MAINTAINER_MODE = yes; then ++ MAINTAINER_MODE_TRUE= ++ MAINTAINER_MODE_FALSE='#' ++else ++ MAINTAINER_MODE_TRUE='#' ++ MAINTAINER_MODE_FALSE= ++fi ++ ++ MAINT=$MAINTAINER_MODE_TRUE + + + +@@ -2133,17 +3359,16 @@ + + + +- + ################################################################################ + # Absolute paths to build and source dirs + # need to substitute these into cscope script + ################################################################################ + # Extract the first word of "pwd", so it can be a program name with args. + set dummy pwd; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_PWD_PROG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_PWD_PROG+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + case $PWD_PROG in + [\\/]* | ?:[\\/]*) +@@ -2155,28 +3380,29 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PWD_PROG="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + + test -z "$ac_cv_path_PWD_PROG" && ac_cv_path_PWD_PROG=""pwd -P"" + ;; + esac + fi + PWD_PROG=$ac_cv_path_PWD_PROG +- + if test -n "$PWD_PROG"; then +- echo "$as_me:$LINENO: result: $PWD_PROG" >&5 +-echo "${ECHO_T}$PWD_PROG" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PWD_PROG" >&5 ++$as_echo "$PWD_PROG" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ + + TOP_BUILDDIR=`${PWD_PROG}` + +@@ -2188,16 +3414,14 @@ + ################################################################################ + + +-# Check whether --with-components or --without-components was given. +-if test "${with_components+set}" = set; then +- withval="$with_components" +- +-fi; ++# Check whether --with-components was given. ++if test "${with_components+set}" = set; then : ++ withval=$with_components; ++fi ++ + case x"$with_components" in + xyes) +- { { echo "$as_me:$LINENO: error: --with-components requires an argument. Known components are: modules util libcr include tests examples contrib" >&5 +-echo "$as_me: error: --with-components requires an argument. Known components are: modules util libcr include tests examples contrib" >&2;} +- { (exit 1); exit 1; }; }; ++ as_fn_error "--with-components requires an argument. Known components are: modules util libcr include tests examples contrib" "$LINENO" 5; + ;; + x) + for cr_lcv in modules util libcr include tests examples contrib; do +@@ -2220,57 +3444,74 @@ + # Check platform + ################################################################################ + # Make sure we can run config.sub. +-$ac_config_sub sun4 >/dev/null 2>&1 || +- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +-echo "$as_me: error: cannot run $ac_config_sub" >&2;} +- { (exit 1); exit 1; }; } +- +-echo "$as_me:$LINENO: checking build system type" >&5 +-echo $ECHO_N "checking build system type... $ECHO_C" >&6 +-if test "${ac_cv_build+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_build_alias=$build_alias +-test -z "$ac_cv_build_alias" && +- ac_cv_build_alias=`$ac_config_guess` +-test -z "$ac_cv_build_alias" && +- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +-echo "$as_me: error: cannot guess build type; you must specify one" >&2;} +- { (exit 1); exit 1; }; } +-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || +- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 +-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +-echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +-echo "${ECHO_T}$ac_cv_build" >&6 ++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || ++ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 ++$as_echo_n "checking build system type... " >&6; } ++if test "${ac_cv_build+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_build_alias=$build_alias ++test "x$ac_build_alias" = x && ++ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` ++test "x$ac_build_alias" = x && ++ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 ++$as_echo "$ac_cv_build" >&6; } ++case $ac_cv_build in ++*-*-*) ;; ++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; ++esac + build=$ac_cv_build +-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +- +- +-echo "$as_me:$LINENO: checking host system type" >&5 +-echo $ECHO_N "checking host system type... $ECHO_C" >&6 +-if test "${ac_cv_host+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_host_alias=$host_alias +-test -z "$ac_cv_host_alias" && +- ac_cv_host_alias=$ac_cv_build_alias +-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || +- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +-echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +-echo "${ECHO_T}$ac_cv_host" >&6 ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_build ++shift ++build_cpu=$1 ++build_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++build_os=$* ++IFS=$ac_save_IFS ++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 ++$as_echo_n "checking host system type... " >&6; } ++if test "${ac_cv_host+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "x$host_alias" = x; then ++ ac_cv_host=$ac_cv_build ++else ++ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 ++$as_echo "$ac_cv_host" >&6; } ++case $ac_cv_host in ++*-*-*) ;; ++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; ++esac + host=$ac_cv_host +-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_host ++shift ++host_cpu=$1 ++host_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++host_os=$* ++IFS=$ac_save_IFS ++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + + case $host_os in +@@ -2295,45 +3536,63 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +- { { echo "$as_me:$LINENO: error: the host system must be Linux (have $host_os)" >&5 +-echo "$as_me: error: the host system must be Linux (have $host_os)" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "the host system must be Linux (have $host_os)" "$LINENO" 5 + ;; + esac + CR_ARCH=$host_cpu +@@ -2360,45 +3619,63 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +- { { echo "$as_me:$LINENO: error: i386 not supported, i486 or higher is required" >&5 +-echo "$as_me: error: i386 not supported, i486 or higher is required" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "i386 not supported, i486 or higher is required" "$LINENO" 5 + ;; + i?86) + CR_ARCH=i386 +@@ -2439,9 +3716,7 @@ + cr_arch_incomplete=yes + ;; + *) +- { { echo "$as_me:$LINENO: error: Sorry, architecture $host_cpu is not supported at this time." >&5 +-echo "$as_me: error: Sorry, architecture $host_cpu is not supported at this time." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Sorry, architecture $host_cpu is not supported at this time." "$LINENO" 5 + ;; + esac + +@@ -2452,98 +3727,91 @@ + + # Let user specify location of Linux kernel headers and build + +-# Check whether --with-linux or --without-linux was given. +-if test "${with_linux+set}" = set; then +- withval="$with_linux" +- if test x"$with_linux" != xyes; then ++# Check whether --with-linux was given. ++if test "${with_linux+set}" = set; then : ++ withval=$with_linux; if test x"$with_linux" != xyes; then : + LINUX_OBJ_ARG=$with_linux + fi +- +-fi; +- +-# Check whether --with-linux-src or --without-linux-src was given. +-if test "${with_linux_src+set}" = set; then +- withval="$with_linux_src" +- if test x"$with_linux_src" != xyes; then ++fi ++ ++ ++# Check whether --with-linux-src was given. ++if test "${with_linux_src+set}" = set; then : ++ withval=$with_linux_src; if test x"$with_linux_src" != xyes; then : + LINUX_SRC_ARG=$with_linux_src + fi +- +-fi; ++fi ++ + + # Let user specify location of kernel System.map and/or vmlinux + +-# Check whether --with-system-map or --without-system-map was given. +-if test "${with_system_map+set}" = set; then +- withval="$with_system_map" +- if test x"$with_system_map" != xyes; then ++# Check whether --with-system-map was given. ++if test "${with_system_map+set}" = set; then : ++ withval=$with_system_map; if test x"$with_system_map" != xyes; then : + LINUX_SYSTEM_MAP=$with_system_map + fi +- +-fi; +- +-# Check whether --with-vmlinux or --without-vmlinux was given. +-if test "${with_vmlinux+set}" = set; then +- withval="$with_vmlinux" +- if test x"$with_vmlinux" != xyes; then ++fi ++ ++ ++# Check whether --with-vmlinux was given. ++if test "${with_vmlinux+set}" = set; then : ++ withval=$with_vmlinux; if test x"$with_vmlinux" != xyes; then : + LINUX_VMLINUX=$with_vmlinux + fi +- +-fi; ++fi ++ + + # Let user specify dir to install kernel modules + +-# Check whether --with-kmod-dir or --without-kmod-dir was given. +-if test "${with_kmod_dir+set}" = set; then +- withval="$with_kmod_dir" +- if test x"$with_kmod_dir" != xyes; then ++# Check whether --with-kmod-dir was given. ++if test "${with_kmod_dir+set}" = set; then : ++ withval=$with_kmod_dir; if test x"$with_kmod_dir" != xyes; then : + CR_MODULE_DIR=$with_kmod_dir + fi +- +-fi; ++fi ++ + + # Let user force UP, SMP or HUGEMEM kernel configs on RH (and similar) systems + +-# Check whether --with-kernel-type or --without-kernel-type was given. +-if test "${with_kernel_type+set}" = set; then +- withval="$with_kernel_type" +- +-fi; ++# Check whether --with-kernel-type was given. ++if test "${with_kernel_type+set}" = set; then : ++ withval=$with_kernel_type; ++fi ++ + + # Let user supress the printing of the final configuration report + +- # Check whether --enable-config-report or --disable-config-report was given. +-if test "${enable_config_report+set}" = set; then +- enableval="$enable_config_report" +- : ++ # Check whether --enable-config-report was given. ++if test "${enable_config_report+set}" = set; then : ++ enableval=$enable_config_report; : + else + enable_config_report=yes +-fi; ++fi ++ + + + # Let the user request/supress use of V=1 with kbuild + +- # Check whether --enable-kbuild-verbose or --disable-kbuild-verbose was given. +-if test "${enable_kbuild_verbose+set}" = set; then +- enableval="$enable_kbuild_verbose" +- : ++ # Check whether --enable-kbuild-verbose was given. ++if test "${enable_kbuild_verbose+set}" = set; then : ++ enableval=$enable_kbuild_verbose; : + else + enable_kbuild_verbose=no +-fi; ++fi ++ + + + # Debugging (implies tracing enabled by default) + +- # Check whether --enable-debug or --disable-debug was given. +-if test "${enable_debug+set}" = set; then +- enableval="$enable_debug" +- : ++ # Check whether --enable-debug was given. ++if test "${enable_debug+set}" = set; then : ++ enableval=$enable_debug; : + else + enable_debug=no +-fi; +- +- +- +-if test x$enable_debug = xyes; then ++fi ++ ++ ++ if test x$enable_debug = xyes; then + CRI_DEBUG_TRUE= + CRI_DEBUG_FALSE='#' + else +@@ -2553,40 +3821,32 @@ + + + if test x$enable_debug = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define CRI_DEBUG 1 +-_ACEOF +- +- else +- cat >>confdefs.h <<\_ACEOF +-#define CRI_DEBUG 0 +-_ACEOF +- +- fi +- +- +- +-if test x$enable_debug = xyes; then ++ $as_echo "#define CRI_DEBUG 1" >>confdefs.h ++ ++ else ++ $as_echo "#define CRI_DEBUG 0" >>confdefs.h ++ ++ fi ++ ++ ++if test x$enable_debug = xyes; then : + CR_NDEBUG="" + else + CR_NDEBUG="-DNDEBUG" + fi + + +- + # Feature libcr-tracing + +- # Check whether --enable-libcr-tracing or --disable-libcr-tracing was given. +-if test "${enable_libcr_tracing+set}" = set; then +- enableval="$enable_libcr_tracing" +- : ++ # Check whether --enable-libcr-tracing was given. ++if test "${enable_libcr_tracing+set}" = set; then : ++ enableval=$enable_libcr_tracing; : + else + enable_libcr_tracing=$enable_debug +-fi; +- +- +- +-if test x$enable_libcr_tracing = xyes; then ++fi ++ ++ ++ if test x$enable_libcr_tracing = xyes; then + LIBCR_TRACING_TRUE= + LIBCR_TRACING_FALSE='#' + else +@@ -2596,33 +3856,26 @@ + + + if test x$enable_libcr_tracing = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define LIBCR_TRACING 1 +-_ACEOF +- +- else +- cat >>confdefs.h <<\_ACEOF +-#define LIBCR_TRACING 0 +-_ACEOF +- +- fi +- ++ $as_echo "#define LIBCR_TRACING 1" >>confdefs.h ++ ++ else ++ $as_echo "#define LIBCR_TRACING 0" >>confdefs.h ++ ++ fi + + + + # Feature kernel-tracing + +- # Check whether --enable-kernel-tracing or --disable-kernel-tracing was given. +-if test "${enable_kernel_tracing+set}" = set; then +- enableval="$enable_kernel_tracing" +- : ++ # Check whether --enable-kernel-tracing was given. ++if test "${enable_kernel_tracing+set}" = set; then : ++ enableval=$enable_kernel_tracing; : + else + enable_kernel_tracing=$enable_debug +-fi; +- +- +- +-if test x$enable_kernel_tracing = xyes; then ++fi ++ ++ ++ if test x$enable_kernel_tracing = xyes; then + CR_KERNEL_TRACING_TRUE= + CR_KERNEL_TRACING_FALSE='#' + else +@@ -2632,44 +3885,37 @@ + + + if test x$enable_kernel_tracing = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define CR_KERNEL_TRACING 1 +-_ACEOF +- +- else +- cat >>confdefs.h <<\_ACEOF +-#define CR_KERNEL_TRACING 0 +-_ACEOF +- +- fi +- ++ $as_echo "#define CR_KERNEL_TRACING 1" >>confdefs.h ++ ++ else ++ $as_echo "#define CR_KERNEL_TRACING 0" >>confdefs.h ++ ++ fi + + + + # Multilib support + +- # Check whether --enable-multilib or --disable-multilib was given. +-if test "${enable_multilib+set}" = set; then +- enableval="$enable_multilib" +- : ++ # Check whether --enable-multilib was given. ++if test "${enable_multilib+set}" = set; then : ++ enableval=$enable_multilib; : + else + enable_multilib=no +-fi; ++fi ++ + + + # Optional /etc/init.d/blcr file + +- # Check whether --enable-init-script or --disable-init-script was given. +-if test "${enable_init_script+set}" = set; then +- enableval="$enable_init_script" +- : ++ # Check whether --enable-init-script was given. ++if test "${enable_init_script+set}" = set; then : ++ enableval=$enable_init_script; : + else + enable_init_script=no +-fi; +- +- +- +-if test x$enable_init_script = xyes; then ++fi ++ ++ ++ if test x$enable_init_script = xyes; then + CR_BUILD_ETC_TRUE= + CR_BUILD_ETC_FALSE='#' + else +@@ -2680,42 +3926,35 @@ + + # Check is restoring uid, gid and supplemental groups is requested + +- # Check whether --enable-restore-ids or --disable-restore-ids was given. +-if test "${enable_restore_ids+set}" = set; then +- enableval="$enable_restore_ids" +- : ++ # Check whether --enable-restore-ids was given. ++if test "${enable_restore_ids+set}" = set; then : ++ enableval=$enable_restore_ids; : + else + enable_restore_ids=no +-fi; ++fi ++ + + + if test x$enable_restore_ids = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define CR_RESTORE_IDS 1 +-_ACEOF +- +- else +- cat >>confdefs.h <<\_ACEOF +-#define CR_RESTORE_IDS 0 +-_ACEOF +- +- fi +- ++ $as_echo "#define CR_RESTORE_IDS 1" >>confdefs.h ++ ++ else ++ $as_echo "#define CR_RESTORE_IDS 0" >>confdefs.h ++ ++ fi + + + + # Let user build against an already installed libcr + +-# Check whether --with-installed-libcr or --without-installed-libcr was given. +-if test "${with_installed_libcr+set}" = set; then +- withval="$with_installed_libcr" +- ++# Check whether --with-installed-libcr was given. ++if test "${with_installed_libcr+set}" = set; then : ++ withval=$with_installed_libcr; + cr_build_libcr=no + cr_build_include=no +-fi; +- +- +-if test x$with_installed_libcr = xyes; then ++fi ++ ++ if test x$with_installed_libcr = xyes; then + CR_INSTALLED_LIBCR_TRUE= + CR_INSTALLED_LIBCR_FALSE='#' + else +@@ -2726,15 +3965,13 @@ + + # Let user build/test against already installed utilities + +-# Check whether --with-installed-util or --without-installed-util was given. +-if test "${with_installed_util+set}" = set; then +- withval="$with_installed_util" +- ++# Check whether --with-installed-util was given. ++if test "${with_installed_util+set}" = set; then : ++ withval=$with_installed_util; + cr_build_util=no +-fi; +- +- +-if test x$with_installed_util = xyes; then ++fi ++ ++ if test x$with_installed_util = xyes; then + CR_INSTALLED_UTIL_TRUE= + CR_INSTALLED_UTIL_FALSE='#' + else +@@ -2745,26 +3982,24 @@ + + # Let user build/run/test against already installed kernel modules + +-# Check whether --with-installed-modules or --without-installed-modules was given. +-if test "${with_installed_modules+set}" = set; then +- withval="$with_installed_modules" +- ++# Check whether --with-installed-modules was given. ++if test "${with_installed_modules+set}" = set; then : ++ withval=$with_installed_modules; + cr_build_modules=no +-fi; ++fi ++ + + # Let user request installation of the test suite + +- # Check whether --enable-testsuite or --disable-testsuite was given. +-if test "${enable_testsuite+set}" = set; then +- enableval="$enable_testsuite" +- : ++ # Check whether --enable-testsuite was given. ++if test "${enable_testsuite+set}" = set; then : ++ enableval=$enable_testsuite; : + else + enable_testsuite=no +-fi; +- +- +- +-if test x$enable_testsuite = xyes; then ++fi ++ ++ ++ if test x$enable_testsuite = xyes; then + CR_BUILD_TESTSUITE_TRUE= + CR_BUILD_TESTSUITE_FALSE='#' + else +@@ -2775,35 +4010,35 @@ + + # Let user request static utils, tests and examples + +- # Check whether --enable-all-static or --disable-all-static was given. +-if test "${enable_all_static+set}" = set; then +- enableval="$enable_all_static" +- : ++ # Check whether --enable-all-static was given. ++if test "${enable_all_static+set}" = set; then : ++ enableval=$enable_all_static; : + else + enable_all_static=no +-fi; ++fi ++ + + + # Let user request optional "cr_info" util + +- # Check whether --enable-cr-info or --disable-cr-info was given. +-if test "${enable_cr_info+set}" = set; then +- enableval="$enable_cr_info" +- : ++ # Check whether --enable-cr-info was given. ++if test "${enable_cr_info+set}" = set; then : ++ enableval=$enable_cr_info; : + else + enable_cr_info=no +-fi; ++fi ++ + + + # Let user specify location of optional FTB headers & libs + +-# Check whether --with-ftb or --without-ftb was given. +-if test "${with_ftb+set}" = set; then +- withval="$with_ftb" +- FTB_HOME=$withval; cr_force_ftb=yes ++# Check whether --with-ftb was given. ++if test "${with_ftb+set}" = set; then : ++ withval=$with_ftb; FTB_HOME=$withval; cr_force_ftb=yes + else + FTB_HOME='/usr/local/ftb' +-fi; ++fi ++ + #XXX: HACK to disable FTB unless explictly requested + if test x"$cr_force_ftb" != xyes; then FTB_HOME=no; fi + +@@ -2811,11 +4046,11 @@ + # TODO: automate when building both kernel modules and libcr + if expr $CR_ARCH : ppc >/dev/null; then + +-# Check whether --with-bug2524 or --without-bug2524 was given. +-if test "${with_bug2524+set}" = set; then +- withval="$with_bug2524" +- force_bug2524=$withval +-fi; ++# Check whether --with-bug2524 was given. ++if test "${with_bug2524+set}" = set; then : ++ withval=$with_bug2524; force_bug2524=$withval ++fi ++ + fi + + ################################################################################ +@@ -2833,10 +4068,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_PERL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_PERL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + case $PERL in + [\\/]* | ?:[\\/]*) +@@ -2848,35 +4083,34 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + + ;; + esac + fi + PERL=$ac_cv_path_PERL +- + if test -n "$PERL"; then +- echo "$as_me:$LINENO: result: $PERL" >&5 +-echo "${ECHO_T}$PERL" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 ++$as_echo "$PERL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ + + test -n "$PERL" && break + done + + if test -z "$PERL"; then +- { { echo "$as_me:$LINENO: error: cannot find a version of perl - please install perl and/or set \$PERL to indicate where it's located" >&5 +-echo "$as_me: error: cannot find a version of perl - please install perl and/or set \$PERL to indicate where it's located" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot find a version of perl - please install perl and/or set \$PERL to indicate where it's located" "$LINENO" 5 + fi + PERL=$PERL + +@@ -2886,10 +4120,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_MAKE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_MAKE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + case $MAKE in + [\\/]* | ?:[\\/]*) +@@ -2901,49 +4135,48 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MAKE="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + + ;; + esac + fi + MAKE=$ac_cv_path_MAKE +- + if test -n "$MAKE"; then +- echo "$as_me:$LINENO: result: $MAKE" >&5 +-echo "${ECHO_T}$MAKE" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5 ++$as_echo "$MAKE" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ + + test -n "$MAKE" && break + done + + if test -n "$MAKE"; then +- echo "$as_me:$LINENO: checking if $MAKE is GNU make" >&5 +-echo $ECHO_N "checking if $MAKE is GNU make... $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MAKE is GNU make" >&5 ++$as_echo_n "checking if $MAKE is GNU make... " >&6; } + MAKE_VERSTR=`$MAKE --version | grep GNU 2> /dev/null` + if test -z "$MAKE_VERSTR" ; then +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + else + #MAKE_VER=`echo "$MAKE_VERSTR" | perl -n -e 'if (/([[0-9]]+)\.([[0-9]]+)(\.[[0-9]]+)?/) { $maj=$1; $min=$2; $pat=$3; printf "%i%03i%03i",($maj,$min,($pat?$pat=~s/\.//:0)) }'` + MAKE_VERSION=`echo "$MAKE_VERSTR" | perl -n -e 'if (/(([0-9]+)\.([0-9]+)(\.[0-9]+)?)/) { print $1 }'` +- echo "$as_me:$LINENO: result: yes ($MAKE_VERSION)" >&5 +-echo "${ECHO_T}yes ($MAKE_VERSION)" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($MAKE_VERSION)" >&5 ++$as_echo "yes ($MAKE_VERSION)" >&6; } + fi + fi + if test -z "$MAKE_VERSTR" ; then +- { { echo "$as_me:$LINENO: error: cannot find a version of GNU make - please install GNU make and/or set \$MAKE to indicate where it's located" >&5 +-echo "$as_me: error: cannot find a version of GNU make - please install GNU make and/or set \$MAKE to indicate where it's located" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot find a version of GNU make - please install GNU make and/or set \$MAKE to indicate where it's located" "$LINENO" 5 + fi + + # What language(s) do we need +@@ -2958,10 +4191,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_RANLIB+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_RANLIB+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +@@ -2971,35 +4204,37 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + + fi + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:$LINENO: result: $RANLIB" >&5 +-echo "${ECHO_T}$RANLIB" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 ++$as_echo "$RANLIB" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ + + fi + if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +@@ -3009,52 +4244,61 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ + fi + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +-echo "${ECHO_T}$ac_ct_RANLIB" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- RANLIB=$ac_ct_RANLIB ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 ++$as_echo "$ac_ct_RANLIB" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_RANLIB" = x; then ++ RANLIB=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ RANLIB=$ac_ct_RANLIB ++ fi + else + RANLIB="$ac_cv_prog_RANLIB" + fi + + + # For symbolic links +-echo "$as_me:$LINENO: checking whether ln -s works" >&5 +-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 ++$as_echo_n "checking whether ln -s works... " >&6; } + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +-else +- echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +-echo "${ECHO_T}no, using $LN_S" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 ++$as_echo "no, using $LN_S" >&6; } + fi + + + # We use libtool to build + # - only build shared lib for now +-# Check whether --enable-static or --disable-static was given. +-if test "${enable_static+set}" = set; then +- enableval="$enable_static" +- p=${PACKAGE-default} ++# Check whether --enable-static was given. ++if test "${enable_static+set}" = set; then : ++ enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; +@@ -3073,113 +4317,95 @@ + esac + else + enable_static=no +-fi; +- +- +-# Check whether --enable-shared or --disable-shared was given. +-if test "${enable_shared+set}" = set; then +- enableval="$enable_shared" +- p=${PACKAGE-default} +- case $enableval in +- yes) enable_shared=yes ;; +- no) enable_shared=no ;; +- *) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac +-else +- enable_shared=yes +-fi; +- +-# Check whether --enable-fast-install or --disable-fast-install was given. +-if test "${enable_fast_install+set}" = set; then +- enableval="$enable_fast_install" +- p=${PACKAGE-default} +- case $enableval in +- yes) enable_fast_install=yes ;; +- no) enable_fast_install=no ;; +- *) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac +-else +- enable_fast_install=yes +-fi; ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++case `pwd` in ++ *\ * | *\ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 ++$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; ++esac ++ ++ ++ ++macro_version='2.2.6b' ++macro_revision='1.3017' ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ltmain="$ac_aux_dir/ltmain.sh" + + DEPDIR="${am__leading_dot}deps" + +- ac_config_commands="$ac_config_commands depfiles" ++ac_config_commands="$ac_config_commands depfiles" + + + am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: +- @echo done ++ @echo this is the am__doit target + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 ++$as_echo_n "checking for style of include used by $am_make... " >&6; } + am__include="#" + am__quote= + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- fi +-fi +- +- +-echo "$as_me:$LINENO: result: $_am_result" >&5 +-echo "${ECHO_T}$_am_result" >&6 ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac ++fi ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 ++$as_echo "$_am_result" >&6; } + rm -f confinc confmf + +-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +-if test "${enable_dependency_tracking+set}" = set; then +- enableval="$enable_dependency_tracking" +- +-fi; ++# Check whether --enable-dependency-tracking was given. ++if test "${enable_dependency_tracking+set}" = set; then : ++ enableval=$enable_dependency_tracking; ++fi ++ + if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi +- +- +-if test "x$enable_dependency_tracking" != xno; then ++ if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' + else +@@ -3188,7 +4414,6 @@ + fi + + +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -3197,10 +4422,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3210,35 +4435,37 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ + + fi + if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -3248,39 +4475,50 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- CC=$ac_ct_CC ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi + else + CC="$ac_cv_prog_CC" + fi + + if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3290,77 +4528,37 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- CC=$ac_ct_CC +-else +- CC="$ac_cv_prog_CC" +-fi +- ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ fi + fi + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3371,18 +4569,19 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. +@@ -3400,24 +4599,25 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ + + fi + if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then +- for ac_prog in cl ++ for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3427,39 +4627,41 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ + + test -n "$CC" && break + done + fi + if test -z "$CC"; then + ac_ct_CC=$CC +- for ac_prog in cl ++ for ac_prog in cl.exe + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -3469,66 +4671,78 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ + + test -n "$ac_ct_CC" && break + done + +- CC=$ac_ct_CC +-fi +- +-fi +- +- +-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++fi ++ ++fi ++ ++ ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "no acceptable C compiler found in \$PATH ++See \`config.log' for more details." "$LINENO" 5; } + + # Provide some information about the compiler. +-echo "$as_me:$LINENO:" \ +- "checking for C compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +- (eval $ac_compiler --version &5) 2>&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 +- (eval $ac_compiler -v &5) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 +- (eval $ac_compiler -V &5) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +- +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done ++ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3540,112 +4754,109 @@ + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.exe b.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 +-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 +- (eval $ac_link_default) 2>&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } ++ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++ ++# The possible output files: ++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" ++ ++ac_rmfiles= ++for ac_file in $ac_files ++do ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; ++ * ) ac_rmfiles="$ac_rmfiles $ac_file";; ++ esac ++done ++rm -f $ac_rmfiles ++ ++if { { ac_try="$ac_link_default" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link_default") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- # Find the output, starting from the most likely. This scheme is +-# not robust to junk in `.', hence go to wildcards (a.*) only as a last +-# resort. +- +-# Be careful to initialize this variable, since it used to be cached. +-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +-ac_cv_exeext= +-# b.out is created by i960 compilers. +-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : ++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. ++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' ++# in a Makefile. We should not override ac_cv_exeext if it was cached, ++# so that the user can short-circuit this test for compilers unknown to ++# Autoconf. ++for ac_file in $ac_files '' + do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) +- ;; +- conftest.$ac_ext ) +- # This is the source file. ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) +- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- # FIXME: I believe we export ac_cv_exeext for Libtool, +- # but it would be cool to find out if it's true. Does anybody +- # maintain Libtool? --akim. +- export ac_cv_exeext ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ then :; else ++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ fi ++ # We set ac_cv_exeext here because the later test for it is not ++ # safe: cross compilers may not add the suffix if given an `-o' ++ # argument, so we may need to know it at that point already. ++ # Even if this section looks crufty: it has the advantage of ++ # actually working. + break;; + * ) + break;; + esac + done +-else +- echo "$as_me: failed program was:" >&5 ++test "$ac_cv_exeext" = no && ac_cv_exeext= ++ ++else ++ ac_file='' ++fi ++if test -z "$ac_file"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C compiler cannot create executables +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; } +-fi +- ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "C compiler cannot create executables ++See \`config.log' for more details." "$LINENO" 5; }; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext +-echo "$as_me:$LINENO: result: $ac_file" >&5 +-echo "${ECHO_T}$ac_file" >&6 +- +-# Check the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 ++ ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 ++$as_echo_n "checking for suffix of executables... " >&6; } ++if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +- fi +- fi +-fi +-echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- +-rm -f a.out a.exe conftest$ac_cv_exeext b.out +-ac_clean_files=$ac_clean_files_save +-# Check the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-echo "${ECHO_T}$cross_compiling" >&6 +- +-echo "$as_me:$LINENO: checking for suffix of executables" >&5 +-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will + # work properly (i.e., refer to `conftest.exe'), while it won't with +@@ -3653,38 +4864,90 @@ + for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- export ac_cv_exeext + break;; + * ) break;; + esac + done + else +- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-fi +- +-rm -f conftest$ac_cv_exeext +-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-echo "${ECHO_T}$ac_cv_exeext" >&6 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." "$LINENO" 5; } ++fi ++rm -f conftest conftest$ac_cv_exeext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 ++$as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-echo "$as_me:$LINENO: checking for suffix of object files" >&5 +-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +-if test "${ac_cv_objext+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 ++$as_echo_n "checking for suffix of object files... " >&6; } ++if test "${ac_cv_objext+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3696,45 +4959,46 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 ++if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : ++ for ac_file in conftest.o conftest.obj conftest.*; do ++ test -f "$ac_file" || continue; + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac + done + else +- echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-fi +- ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." "$LINENO" 5; } ++fi + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-echo "${ECHO_T}$ac_cv_objext" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 ++$as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +-if test "${ac_cv_c_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3748,98 +5012,87 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_compiler_gnu=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_compiler_gnu=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +-GCC=`test $ac_compiler_gnu = yes && echo yes` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 ++$as_echo "$ac_cv_c_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GCC=yes ++else ++ GCC= ++fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-CFLAGS="-g" +-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +-if test "${ac_cv_prog_cc_g+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 ++$as_echo_n "checking whether $CC accepts -g... " >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_prog_cc_g=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_g=yes ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 ++$as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then +@@ -3855,18 +5108,14 @@ + CFLAGS= + fi + fi +-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +-if test "${ac_cv_prog_cc_stdc+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_prog_cc_stdc=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 ++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -3894,12 +5143,17 @@ + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated +- as 'x'. The following induces an error, until -std1 is added to get ++ as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something +- that's true only with -std1. */ ++ that's true only with -std. */ + int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ++ + int test (int i, double x); + struct s1 {int (*f) (int a);}; + struct s2 {int (*f) (double a);}; +@@ -3914,205 +5168,37 @@ + return 0; + } + _ACEOF +-# Don't try gcc -ansi; that turns off useful extensions and +-# breaks some systems' header files. +-# AIX -qlanglvl=ansi +-# Ultrix and OSF/1 -std1 +-# HP-UX 10.20 and later -Ae +-# HP-UX older versions -Aa -D_HPUX_SOURCE +-# SVR4 -Xc -D__EXTENSIONS__ +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_prog_cc_stdc=$ac_arg +-break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext +-done +-rm -f conftest.$ac_ext conftest.$ac_objext ++ if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_c89=$ac_arg ++fi ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break ++done ++rm -f conftest.$ac_ext + CC=$ac_save_CC + + fi +- +-case "x$ac_cv_prog_cc_stdc" in +- x|xno) +- echo "$as_me:$LINENO: result: none needed" >&5 +-echo "${ECHO_T}none needed" >&6 ;; ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 ++$as_echo "none needed" >&6; } ;; ++ xno) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 ++$as_echo "unsupported" >&6; } ;; + *) +- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 +- CC="$CC $ac_cv_prog_cc_stdc" ;; +-esac +- +-# Some people use a C++ compiler to compile C. Since we use `exit', +-# in C++ we need to declare it. In case someone uses the same compiler +-# for both compiling C and C++ we need to have the C++ compiler decide +-# the declaration of exit, since it's the most demanding environment. +-cat >conftest.$ac_ext <<_ACEOF +-#ifndef __cplusplus +- choke me +-#endif +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- for ac_declaration in \ +- '' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_declaration +-#include +-int +-main () +-{ +-exit (42); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-continue +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_declaration +-int +-main () +-{ +-exit (42); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-rm -f conftest* +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ CC="$CC $ac_cv_prog_cc_c89" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; ++esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : ++ ++fi ++ + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -4121,10 +5207,10 @@ + + depcc="$CC" am_compiler_list= + +-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up +@@ -4149,6 +5235,11 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -4166,7 +5257,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -4176,23 +5277,33 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings +- # (even with -Werror). So we grep stderr for any message +- # that says an option was ignored. +- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi +@@ -4206,13 +5317,11 @@ + fi + + fi +-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +- +- +-if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= +@@ -4223,91 +5332,317 @@ + fi + + +-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 +-if test "${lt_cv_path_SED+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- # Loop through the user's path and test for sed and gsed. +-# Then use that list of sed's as ones to test for truncation. +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for lt_ac_prog in sed gsed; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then +- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" +- fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 ++$as_echo_n "checking for a sed that does not truncate output... " >&6; } ++if test "${ac_cv_path_SED+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ ++ for ac_i in 1 2 3 4 5 6 7; do ++ ac_script="$ac_script$as_nl$ac_script" ++ done ++ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed ++ { ac_script=; unset ac_script;} ++ if test -z "$SED"; then ++ ac_path_SED_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in sed gsed; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue ++# Check for GNU ac_path_SED and select it if it is found. ++ # Check for GNU $ac_path_SED ++case `"$ac_path_SED" --version 2>&1` in ++*GNU*) ++ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo '' >> "conftest.nl" ++ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_SED_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_SED="$ac_path_SED" ++ ac_path_SED_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_SED_found && break 3 + done + done +-done +-lt_ac_max=0 +-lt_ac_count=0 +-# Add /usr/xpg4/bin/sed as it is typically found on Solaris +-# along with /bin/sed that truncates output. +-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do +- test ! -f $lt_ac_sed && break +- cat /dev/null > conftest.in +- lt_ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >conftest.in +- # Check for GNU sed and select it if it is found. +- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then +- lt_cv_path_SED=$lt_ac_sed +- break +- fi +- while true; do +- cat conftest.in conftest.in >conftest.tmp +- mv conftest.tmp conftest.in +- cp conftest.in conftest.nl +- echo >>conftest.nl +- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break +- cmp -s conftest.out conftest.nl || break +- # 10000 chars as input seems more than enough +- test $lt_ac_count -gt 10 && break +- lt_ac_count=`expr $lt_ac_count + 1` +- if test $lt_ac_count -gt $lt_ac_max; then +- lt_ac_max=$lt_ac_count +- lt_cv_path_SED=$lt_ac_sed +- fi +- done +-done +-SED=$lt_cv_path_SED +- +-fi +- +-echo "$as_me:$LINENO: result: $SED" >&5 +-echo "${ECHO_T}$SED" >&6 +- +-echo "$as_me:$LINENO: checking for egrep" >&5 +-echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +-if test "${ac_cv_prog_egrep+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' +- fi +-fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +-echo "${ECHO_T}$ac_cv_prog_egrep" >&6 +- EGREP=$ac_cv_prog_egrep +- +- +- +-# Check whether --with-gnu-ld or --without-gnu-ld was given. +-if test "${with_gnu_ld+set}" = set; then +- withval="$with_gnu_ld" +- test "$withval" = no || with_gnu_ld=yes ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_SED"; then ++ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_SED=$SED ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 ++$as_echo "$ac_cv_path_SED" >&6; } ++ SED="$ac_cv_path_SED" ++ rm -f conftest.sed ++ ++test -z "$SED" && SED=sed ++Xsed="$SED -e 1s/^X//" ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 ++$as_echo_n "checking for grep that handles long lines and -e... " >&6; } ++if test "${ac_cv_path_GREP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$GREP"; then ++ ac_path_GREP_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in grep ggrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue ++# Check for GNU ac_path_GREP and select it if it is found. ++ # Check for GNU $ac_path_GREP ++case `"$ac_path_GREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo 'GREP' >> "conftest.nl" ++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_GREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_GREP="$ac_path_GREP" ++ ac_path_GREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_GREP_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_GREP"; then ++ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_GREP=$GREP ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 ++$as_echo "$ac_cv_path_GREP" >&6; } ++ GREP="$ac_cv_path_GREP" ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 ++$as_echo_n "checking for egrep... " >&6; } ++if test "${ac_cv_path_EGREP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 ++ then ac_cv_path_EGREP="$GREP -E" ++ else ++ if test -z "$EGREP"; then ++ ac_path_EGREP_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in egrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue ++# Check for GNU ac_path_EGREP and select it if it is found. ++ # Check for GNU $ac_path_EGREP ++case `"$ac_path_EGREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo 'EGREP' >> "conftest.nl" ++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_EGREP="$ac_path_EGREP" ++ ac_path_EGREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_EGREP_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_EGREP"; then ++ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_EGREP=$EGREP ++fi ++ ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 ++$as_echo "$ac_cv_path_EGREP" >&6; } ++ EGREP="$ac_cv_path_EGREP" ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 ++$as_echo_n "checking for fgrep... " >&6; } ++if test "${ac_cv_path_FGREP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 ++ then ac_cv_path_FGREP="$GREP -F" ++ else ++ if test -z "$FGREP"; then ++ ac_path_FGREP_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in fgrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue ++# Check for GNU ac_path_FGREP and select it if it is found. ++ # Check for GNU $ac_path_FGREP ++case `"$ac_path_FGREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo 'FGREP' >> "conftest.nl" ++ "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_FGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_FGREP="$ac_path_FGREP" ++ ac_path_FGREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_FGREP_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_FGREP"; then ++ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_FGREP=$FGREP ++fi ++ ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 ++$as_echo "$ac_cv_path_FGREP" >&6; } ++ FGREP="$ac_cv_path_FGREP" ++ ++ ++test -z "$GREP" && GREP=grep ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# Check whether --with-gnu-ld was given. ++if test "${with_gnu_ld+set}" = set; then : ++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + else + with_gnu_ld=no +-fi; ++fi ++ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 ++$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -4320,9 +5655,9 @@ + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld +- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` ++ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; +@@ -4336,14 +5671,14 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- echo "$as_me:$LINENO: checking for GNU ld" >&5 +-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 +-else +- echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 +-fi +-if test "${lt_cv_path_LD+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 ++$as_echo_n "checking for GNU ld... " >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 ++$as_echo_n "checking for non-GNU ld... " >&6; } ++fi ++if test "${lt_cv_path_LD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +@@ -4353,7 +5688,7 @@ + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some GNU ld's only accept -v. ++ # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +-echo "${ECHO_T}$LD" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } +-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +-if test "${lt_cv_prog_gnu_ld+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- # I'd rather use --version here, but apparently some GNU ld's only accept -v. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 ++$as_echo "$LD" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 ++$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } ++if test "${lt_cv_prog_gnu_ld+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 &5 +-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 ++$as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + +-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 +-if test "${lt_cv_ld_reload_flag+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 ++$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } ++if test "${lt_cv_path_NM+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$NM"; then ++ # Let the user override the test. ++ lt_cv_path_NM="$NM" ++else ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" ++ fi ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" ++ break ++ ;; ++ *) ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++ done ++ : ${lt_cv_path_NM=no} ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 ++$as_echo "$lt_cv_path_NM" >&6; } ++if test "$lt_cv_path_NM" != "no"; then ++ NM="$lt_cv_path_NM" ++else ++ # Didn't find any BSD compatible name lister, look for dumpbin. ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in "dumpbin -symbols" "link -dump -symbols" ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DUMPBIN+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DUMPBIN"; then ++ ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DUMPBIN=$ac_cv_prog_DUMPBIN ++if test -n "$DUMPBIN"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 ++$as_echo "$DUMPBIN" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$DUMPBIN" && break ++ done ++fi ++if test -z "$DUMPBIN"; then ++ ac_ct_DUMPBIN=$DUMPBIN ++ for ac_prog in "dumpbin -symbols" "link -dump -symbols" ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DUMPBIN"; then ++ ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN ++if test -n "$ac_ct_DUMPBIN"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 ++$as_echo "$ac_ct_DUMPBIN" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_DUMPBIN" && break ++done ++ ++ if test "x$ac_ct_DUMPBIN" = x; then ++ DUMPBIN=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DUMPBIN=$ac_ct_DUMPBIN ++ fi ++fi ++ ++ ++ if test "$DUMPBIN" != ":"; then ++ NM="$DUMPBIN" ++ fi ++fi ++test -z "$NM" && NM=nm ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 ++$as_echo_n "checking the name lister ($NM) interface... " >&6; } ++if test "${lt_cv_nm_interface+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_nm_interface="BSD nm" ++ echo "int some_variable = 0;" > conftest.$ac_ext ++ (eval echo "\"\$as_me:5919: $ac_compile\"" >&5) ++ (eval "$ac_compile" 2>conftest.err) ++ cat conftest.err >&5 ++ (eval echo "\"\$as_me:5922: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) ++ cat conftest.err >&5 ++ (eval echo "\"\$as_me:5925: output\"" >&5) ++ cat conftest.out >&5 ++ if $GREP 'External.*some_variable' conftest.out > /dev/null; then ++ lt_cv_nm_interface="MS dumpbin" ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 ++$as_echo "$lt_cv_nm_interface" >&6; } ++ ++# find the maximum length of command line arguments ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 ++$as_echo_n "checking the maximum length of command line arguments... " >&6; } ++if test "${lt_cv_sys_max_cmd_len+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ i=0 ++ teststring="ABCD" ++ ++ case $build_os in ++ msdosdjgpp*) ++ # On DJGPP, this test can blow up pretty badly due to problems in libc ++ # (any single argument exceeding 2000 bytes causes a buffer overrun ++ # during glob expansion). Even if it were fixed, the result of this ++ # check would be larger than it should be. ++ lt_cv_sys_max_cmd_len=12288; # 12K is about right ++ ;; ++ ++ gnu*) ++ # Under GNU Hurd, this test is not required because there is ++ # no limit to the length of command line arguments. ++ # Libtool will interpret -1 as no limit whatsoever ++ lt_cv_sys_max_cmd_len=-1; ++ ;; ++ ++ cygwin* | mingw* | cegcc*) ++ # On Win9x/ME, this test blows up -- it succeeds, but takes ++ # about 5 minutes as the teststring grows exponentially. ++ # Worse, since 9x/ME are not pre-emptively multitasking, ++ # you end up with a "frozen" computer, even though with patience ++ # the test eventually succeeds (with a max line length of 256k). ++ # Instead, let's just punt: use the minimum linelength reported by ++ # all of the supported platforms: 8192 (on NT/2K/XP). ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ ;; ++ ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; ++ ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) ++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++ if test -n "$lt_cv_sys_max_cmd_len"; then ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ else ++ # Make teststring a little bigger before we do anything with it. ++ # a 1K string should be a reasonable start. ++ for i in 1 2 3 4 5 6 7 8 ; do ++ teststring=$teststring$teststring ++ done ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ # If test is not a shell built-in, we'll probably end up computing a ++ # maximum length that is only half of the actual maximum length, but ++ # we can't tell. ++ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ ++ = "XX$teststring$teststring"; } >/dev/null 2>&1 && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ # Only check the string length outside the loop. ++ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on ++ # massive amounts of additional arguments before passing them to the ++ # linker. It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ fi ++ ;; ++ esac ++ ++fi ++ ++if test -n $lt_cv_sys_max_cmd_len ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 ++$as_echo "$lt_cv_sys_max_cmd_len" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 ++$as_echo "none" >&6; } ++fi ++max_cmd_len=$lt_cv_sys_max_cmd_len ++ ++ ++ ++ ++ ++ ++: ${CP="cp -f"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 ++$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } ++# Try some XSI features ++xsi_shell=no ++( _lt_dummy="a/b/c" ++ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,, \ ++ && eval 'test $(( 1 + 1 )) -eq 2 \ ++ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ ++ && xsi_shell=yes ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 ++$as_echo "$xsi_shell" >&6; } ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 ++$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } ++lt_shell_append=no ++( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ ++ >/dev/null 2>&1 \ ++ && lt_shell_append=yes ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 ++$as_echo "$lt_shell_append" >&6; } ++ ++ ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ lt_unset=unset ++else ++ lt_unset=false ++fi ++ ++ ++ ++ ++ ++# test EBCDIC or ASCII ++case `echo X|tr X '\101'` in ++ A) # ASCII based system ++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr ++ lt_SP2NL='tr \040 \012' ++ lt_NL2SP='tr \015\012 \040\040' ++ ;; ++ *) # EBCDIC based system ++ lt_SP2NL='tr \100 \n' ++ lt_NL2SP='tr \r\n \100\100' ++ ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 ++$as_echo_n "checking for $LD option to reload object files... " >&6; } ++if test "${lt_cv_ld_reload_flag+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + lt_cv_ld_reload_flag='-r' + fi +-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 ++$as_echo "$lt_cv_ld_reload_flag" >&6; } + reload_flag=$lt_cv_ld_reload_flag + case $reload_flag in + "" | " "*) ;; + *) reload_flag=" $reload_flag" ;; + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' +- +-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 +-if test "${lt_cv_path_NM+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$NM"; then +- # Let the user override the test. +- lt_cv_path_NM="$NM" +-else +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- tmp_nm="$ac_dir/${ac_tool_prefix}nm" +- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then +- # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: +- # nm: unknown option "B" ignored +- # Tru64's nm complains that /dev/null is an invalid object file +- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in +- */dev/null* | *'Invalid file or object type'*) +- lt_cv_path_NM="$tmp_nm -B" +- break +- ;; +- *) +- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in +- */dev/null*) +- lt_cv_path_NM="$tmp_nm -p" +- break +- ;; +- *) +- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but +- continue # so that we can try to find one that supports BSD flags +- ;; +- esac +- esac +- fi +- done +- IFS="$lt_save_ifs" +- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm +-fi +-fi +-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +-echo "${ECHO_T}$lt_cv_path_NM" >&6 +-NM="$lt_cv_path_NM" +- +-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 +-if test "${lt_cv_deplibs_check_method+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++case $host_os in ++ darwin*) ++ if test "$GCC" = yes; then ++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' ++ else ++ reload_cmds='$LD$reload_flag -o $output$reload_objs' ++ fi ++ ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. ++set dummy ${ac_tool_prefix}objdump; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OBJDUMP"; then ++ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++OBJDUMP=$ac_cv_prog_OBJDUMP ++if test -n "$OBJDUMP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 ++$as_echo "$OBJDUMP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OBJDUMP"; then ++ ac_ct_OBJDUMP=$OBJDUMP ++ # Extract the first word of "objdump", so it can be a program name with args. ++set dummy objdump; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OBJDUMP"; then ++ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_OBJDUMP="objdump" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP ++if test -n "$ac_ct_OBJDUMP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 ++$as_echo "$ac_ct_OBJDUMP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_OBJDUMP" = x; then ++ OBJDUMP="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OBJDUMP=$ac_ct_OBJDUMP ++ fi ++else ++ OBJDUMP="$ac_cv_prog_OBJDUMP" ++fi ++ ++test -z "$OBJDUMP" && OBJDUMP=objdump ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 ++$as_echo_n "checking how to recognize dependent libraries... " >&6; } ++if test "${lt_cv_deplibs_check_method+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + lt_cv_file_magic_cmd='$MAGIC_CMD' + lt_cv_file_magic_test_file= +@@ -4484,7 +6280,7 @@ + # whether `pass_all' will *always* work, you probably want this one. + + case $host_os in +-aix4* | aix5*) ++aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -4492,22 +6288,34 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-bsdi4*) ++bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + + cygwin*) +- # win32_libid is a shell function defined in ltmain.sh ++ # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' +- lt_cv_file_magic_cmd='win32_libid' ++ lt_cv_file_magic_cmd='func_win32_libid' + ;; + + mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by +- # win32_libid shell function, so use a weaker test based on 'objdump'. +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # func_win32_libid shell function, so use a weaker test based on 'objdump', ++ # unless we find 'file', for example because we are cross-compiling. ++ if ( file / ) >/dev/null 2>&1; then ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ else ++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ fi ++ ;; ++ ++cegcc) ++ # use the weaker test based on 'objdump'. See mingw*. ++ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +@@ -4515,13 +6323,13 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-freebsd* | kfreebsd*-gnu) +- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++freebsd* | dragonfly*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. +- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' ++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; +@@ -4537,7 +6345,7 @@ + + hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file +- case "$host_cpu" in ++ case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so +@@ -4553,6 +6361,11 @@ + esac + ;; + ++interix[3-9]*) ++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' ++ ;; ++ + irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; +@@ -4564,21 +6377,12 @@ + ;; + + # This must be Linux ELF. +-linux*) +- case $host_cpu in +- alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64) +- lt_cv_deplibs_check_method=pass_all ;; +- *) +- # glibc up to 2.1.1 does not perform some relocations on ARM +- # this will be overridden with pass_all, but let us keep it just in case +- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; +- esac +- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' +@@ -4591,17 +6395,15 @@ + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +-nto-qnx*) +- lt_cv_deplibs_check_method=unknown ++*nto* | *qnx*) ++ lt_cv_deplibs_check_method=pass_all + ;; + + openbsd*) +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' +- else +- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' ++ else ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; + +@@ -4609,7 +6411,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-sco3.2v5*) ++rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -4617,7 +6419,11 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' +@@ -4638,17 +6444,20 @@ + siemens) + lt_cv_deplibs_check_method=pass_all + ;; +- esac +- ;; +- +-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*) ++ pc) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ esac ++ ;; ++ ++tpf*) + lt_cv_deplibs_check_method=pass_all + ;; + esac + + fi +-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 ++$as_echo "$lt_cv_deplibs_check_method" >&6; } + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -4656,18 +6465,632 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. ++set dummy ${ac_tool_prefix}ar; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_AR+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$AR"; then ++ ac_cv_prog_AR="$AR" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_AR="${ac_tool_prefix}ar" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++AR=$ac_cv_prog_AR ++if test -n "$AR"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 ++$as_echo "$AR" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_AR"; then ++ ac_ct_AR=$AR ++ # Extract the first word of "ar", so it can be a program name with args. ++set dummy ar; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_AR"; then ++ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_AR="ar" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_AR=$ac_cv_prog_ac_ct_AR ++if test -n "$ac_ct_AR"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 ++$as_echo "$ac_ct_AR" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_AR" = x; then ++ AR="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ AR=$ac_ct_AR ++ fi ++else ++ AR="$ac_cv_prog_AR" ++fi ++ ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. ++set dummy ${ac_tool_prefix}strip; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$STRIP"; then ++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_STRIP="${ac_tool_prefix}strip" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++STRIP=$ac_cv_prog_STRIP ++if test -n "$STRIP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_STRIP"; then ++ ac_ct_STRIP=$STRIP ++ # Extract the first word of "strip", so it can be a program name with args. ++set dummy strip; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_STRIP"; then ++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_STRIP="strip" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP ++if test -n "$ac_ct_STRIP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi ++else ++ STRIP="$ac_cv_prog_STRIP" ++fi ++ ++test -z "$STRIP" && STRIP=: ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. ++set dummy ${ac_tool_prefix}ranlib; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_RANLIB+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$RANLIB"; then ++ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++RANLIB=$ac_cv_prog_RANLIB ++if test -n "$RANLIB"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 ++$as_echo "$RANLIB" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_RANLIB"; then ++ ac_ct_RANLIB=$RANLIB ++ # Extract the first word of "ranlib", so it can be a program name with args. ++set dummy ranlib; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_RANLIB"; then ++ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_RANLIB="ranlib" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB ++if test -n "$ac_ct_RANLIB"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 ++$as_echo "$ac_ct_RANLIB" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_RANLIB" = x; then ++ RANLIB=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ RANLIB=$ac_ct_RANLIB ++ fi ++else ++ RANLIB="$ac_cv_prog_RANLIB" ++fi ++ ++test -z "$RANLIB" && RANLIB=: ++ ++ ++ ++ ++ ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= ++ ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ + # Allow CC to be a program name with arguments. + compiler=$CC + + +-# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +-if test "${enable_libtool_lock+set}" = set; then +- enableval="$enable_libtool_lock" +- +-fi; ++# Check for command to grab the raw symbol name followed by C symbol from nm. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 ++$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } ++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++# These are sane defaults that work on at least a few old systems. ++# [They come from Ultrix. What could be older than Ultrix?!! ;)] ++ ++# Character class describing NM global symbol codes. ++symcode='[BCDEGRST]' ++ ++# Regexp to match symbols that can be accessed directly from C. ++sympat='\([_A-Za-z][_A-Za-z0-9]*\)' ++ ++# Define system-specific variables. ++case $host_os in ++aix*) ++ symcode='[BCDT]' ++ ;; ++cygwin* | mingw* | pw32* | cegcc*) ++ symcode='[ABCDGISTW]' ++ ;; ++hpux*) ++ if test "$host_cpu" = ia64; then ++ symcode='[ABCDEGRST]' ++ fi ++ ;; ++irix* | nonstopux*) ++ symcode='[BCDEGRST]' ++ ;; ++osf*) ++ symcode='[BCDEGQRST]' ++ ;; ++solaris*) ++ symcode='[BDRT]' ++ ;; ++sco3.2v5*) ++ symcode='[DT]' ++ ;; ++sysv4.2uw2*) ++ symcode='[DT]' ++ ;; ++sysv5* | sco5v6* | unixware* | OpenUNIX*) ++ symcode='[ABDT]' ++ ;; ++sysv4) ++ symcode='[DFNSTU]' ++ ;; ++esac ++ ++# If we're using GNU nm, then use its standard symbol codes. ++case `$NM -V 2>&1` in ++*GNU* | *'with BFD'*) ++ symcode='[ABCDGIRSTW]' ;; ++esac ++ ++# Transform an extracted symbol line into a proper C declaration. ++# Some systems (esp. on ia64) link data and code symbols differently, ++# so use this general approach. ++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++ ++# Transform an extracted symbol line into symbol name and symbol address ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++ ++# Handle CRLF in mingw tool chain ++opt_cr= ++case $build_os in ++mingw*) ++ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++ ;; ++esac ++ ++# Try without a prefix underscore, then with it. ++for ac_symprfx in "" "_"; do ++ ++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++ symxfrm="\\1 $ac_symprfx\\2 \\2" ++ ++ # Write the raw and C identifiers. ++ if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ # Fake it for dumpbin and say T for any non-static function ++ # and D for any global variable. ++ # Also find C++ and __fastcall symbols from MSVC++, ++ # which start with @ or ?. ++ lt_cv_sys_global_symbol_pipe="$AWK '"\ ++" {last_section=section; section=\$ 3};"\ ++" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ ++" \$ 0!~/External *\|/{next};"\ ++" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ ++" {if(hide[section]) next};"\ ++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ ++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ ++" s[1]~/^[@?]/{print s[1], s[1]; next};"\ ++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ ++" ' prfx=^$ac_symprfx" ++ else ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++ fi ++ ++ # Check to see that the pipe works correctly. ++ pipe_works=no ++ ++ rm -f conftest* ++ cat > conftest.$ac_ext <<_LT_EOF ++#ifdef __cplusplus ++extern "C" { ++#endif ++char nm_test_var; ++void nm_test_func(void); ++void nm_test_func(void){} ++#ifdef __cplusplus ++} ++#endif ++int main(){nm_test_var='a';nm_test_func();return(0);} ++_LT_EOF ++ ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ # Now try to grab the symbols. ++ nlist=conftest.nm ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 ++ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s "$nlist"; then ++ # Try sorting and uniquifying the output. ++ if sort "$nlist" | uniq > "$nlist"T; then ++ mv -f "$nlist"T "$nlist" ++ else ++ rm -f "$nlist"T ++ fi ++ ++ # Make sure that we snagged all the symbols we need. ++ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then ++ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then ++ cat <<_LT_EOF > conftest.$ac_ext ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++_LT_EOF ++ # Now generate the symbol file. ++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' ++ ++ cat <<_LT_EOF >> conftest.$ac_ext ++ ++/* The mapping between symbol names and symbols. */ ++const struct { ++ const char *name; ++ void *address; ++} ++lt__PROGRAM__LTX_preloaded_symbols[] = ++{ ++ { "@PROGRAM@", (void *) 0 }, ++_LT_EOF ++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext ++ cat <<\_LT_EOF >> conftest.$ac_ext ++ {0, (void *) 0} ++}; ++ ++/* This works around a problem in FreeBSD linker */ ++#ifdef FREEBSD_WORKAROUND ++static const void *lt_preloaded_setup() { ++ return lt__PROGRAM__LTX_preloaded_symbols; ++} ++#endif ++ ++#ifdef __cplusplus ++} ++#endif ++_LT_EOF ++ # Now try linking the two files. ++ mv conftest.$ac_objext conftstm.$ac_objext ++ lt_save_LIBS="$LIBS" ++ lt_save_CFLAGS="$CFLAGS" ++ LIBS="conftstm.$ac_objext" ++ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext}; then ++ pipe_works=yes ++ fi ++ LIBS="$lt_save_LIBS" ++ CFLAGS="$lt_save_CFLAGS" ++ else ++ echo "cannot find nm_test_func in $nlist" >&5 ++ fi ++ else ++ echo "cannot find nm_test_var in $nlist" >&5 ++ fi ++ else ++ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 ++ fi ++ else ++ echo "$progname: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ fi ++ rm -rf conftest* conftst* ++ ++ # Do not use the global_symbol_pipe unless it works. ++ if test "$pipe_works" = yes; then ++ break ++ else ++ lt_cv_sys_global_symbol_pipe= ++ fi ++done ++ ++fi ++ ++if test -z "$lt_cv_sys_global_symbol_pipe"; then ++ lt_cv_sys_global_symbol_to_cdecl= ++fi ++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 ++$as_echo "failed" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 ++$as_echo "ok" >&6; } ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# Check whether --enable-libtool-lock was given. ++if test "${enable_libtool_lock+set}" = set; then : ++ enableval=$enable_libtool_lock; ++fi ++ + test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + + # Some flags need to be propagated to the compiler or linker for good +@@ -4676,100 +7099,107 @@ + ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in +- *ELF-32*) +- HPUX_IA64_MODE="32" +- ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" +- ;; ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; + esac + fi + rm -rf conftest* + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 4697 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ echo '#line 7120 "configure"' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- if test "$lt_cv_prog_gnu_ld" = yes; then +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -melf32bsmip" +- ;; +- *N32*) +- LD="${LD-ld} -melf32bmipn32" +- ;; +- *64-bit*) +- LD="${LD-ld} -melf64bmip" +- ;; +- esac +- else +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi + fi + rm -rf conftest* + ;; + +-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case "`/usr/bin/file conftest.o`" in +- *32-bit*) +- case $host in +- x86_64-*linux*) +- LD="${LD-ld} -m elf_i386" +- ;; +- ppc64-*linux*|powerpc64-*linux*) +- LD="${LD-ld} -m elf32ppclinux" +- ;; +- s390x-*linux*) +- LD="${LD-ld} -m elf_s390" +- ;; +- sparc64-*linux*) +- LD="${LD-ld} -m elf32_sparc" +- ;; +- esac +- ;; +- *64-bit*) +- case $host in +- x86_64-*linux*) +- LD="${LD-ld} -m elf_x86_64" +- ;; +- ppc*-*linux*|powerpc*-*linux*) +- LD="${LD-ld} -m elf64ppc" +- ;; +- s390*-*linux*) +- LD="${LD-ld} -m elf64_s390" +- ;; +- sparc*-*linux*) +- LD="${LD-ld} -m elf64_sparc" +- ;; +- esac +- ;; ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ case `/usr/bin/file conftest.o` in ++ *32-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *64-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*|s390*-*tpf*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; + esac + fi + rm -rf conftest* +@@ -4779,10 +7209,10 @@ + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" +- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 +-if test "${lt_cv_cc_needs_belf+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 ++$as_echo_n "checking whether the C compiler needs -belf... " >&6; } ++if test "${lt_cv_cc_needs_belf+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -4790,52 +7220,24 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-lt_cv_cc_needs_belf=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++ lt_cv_cc_needs_belf=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -4843,33 +7245,639 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi +-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 ++$as_echo "$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +- ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; + esac + + need_locks="$enable_libtool_lock" + + ++ case $host_os in ++ rhapsody* | darwin*) ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DSYMUTIL"; then ++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DSYMUTIL=$ac_cv_prog_DSYMUTIL ++if test -n "$DSYMUTIL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 ++$as_echo "$DSYMUTIL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DSYMUTIL"; then ++ ac_ct_DSYMUTIL=$DSYMUTIL ++ # Extract the first word of "dsymutil", so it can be a program name with args. ++set dummy dsymutil; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DSYMUTIL"; then ++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL ++if test -n "$ac_ct_DSYMUTIL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 ++$as_echo "$ac_ct_DSYMUTIL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DSYMUTIL" = x; then ++ DSYMUTIL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DSYMUTIL=$ac_ct_DSYMUTIL ++ fi ++else ++ DSYMUTIL="$ac_cv_prog_DSYMUTIL" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. ++set dummy ${ac_tool_prefix}nmedit; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_NMEDIT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$NMEDIT"; then ++ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++NMEDIT=$ac_cv_prog_NMEDIT ++if test -n "$NMEDIT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 ++$as_echo "$NMEDIT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_NMEDIT"; then ++ ac_ct_NMEDIT=$NMEDIT ++ # Extract the first word of "nmedit", so it can be a program name with args. ++set dummy nmedit; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_NMEDIT"; then ++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_NMEDIT="nmedit" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT ++if test -n "$ac_ct_NMEDIT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 ++$as_echo "$ac_ct_NMEDIT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_NMEDIT" = x; then ++ NMEDIT=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ NMEDIT=$ac_ct_NMEDIT ++ fi ++else ++ NMEDIT="$ac_cv_prog_NMEDIT" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. ++set dummy ${ac_tool_prefix}lipo; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_LIPO+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$LIPO"; then ++ ac_cv_prog_LIPO="$LIPO" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_LIPO="${ac_tool_prefix}lipo" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++LIPO=$ac_cv_prog_LIPO ++if test -n "$LIPO"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 ++$as_echo "$LIPO" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_LIPO"; then ++ ac_ct_LIPO=$LIPO ++ # Extract the first word of "lipo", so it can be a program name with args. ++set dummy lipo; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_LIPO"; then ++ ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_LIPO="lipo" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO ++if test -n "$ac_ct_LIPO"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 ++$as_echo "$ac_ct_LIPO" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_LIPO" = x; then ++ LIPO=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ LIPO=$ac_ct_LIPO ++ fi ++else ++ LIPO="$ac_cv_prog_LIPO" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}otool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OTOOL"; then ++ ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_OTOOL="${ac_tool_prefix}otool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++OTOOL=$ac_cv_prog_OTOOL ++if test -n "$OTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 ++$as_echo "$OTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OTOOL"; then ++ ac_ct_OTOOL=$OTOOL ++ # Extract the first word of "otool", so it can be a program name with args. ++set dummy otool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OTOOL"; then ++ ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_OTOOL="otool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL ++if test -n "$ac_ct_OTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 ++$as_echo "$ac_ct_OTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_OTOOL" = x; then ++ OTOOL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OTOOL=$ac_ct_OTOOL ++ fi ++else ++ OTOOL="$ac_cv_prog_OTOOL" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. ++set dummy ${ac_tool_prefix}otool64; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OTOOL64+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OTOOL64"; then ++ ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++OTOOL64=$ac_cv_prog_OTOOL64 ++if test -n "$OTOOL64"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 ++$as_echo "$OTOOL64" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OTOOL64"; then ++ ac_ct_OTOOL64=$OTOOL64 ++ # Extract the first word of "otool64", so it can be a program name with args. ++set dummy otool64; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OTOOL64"; then ++ ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_OTOOL64="otool64" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 ++if test -n "$ac_ct_OTOOL64"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 ++$as_echo "$ac_ct_OTOOL64" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_OTOOL64" = x; then ++ OTOOL64=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OTOOL64=$ac_ct_OTOOL64 ++ fi ++else ++ OTOOL64="$ac_cv_prog_OTOOL64" ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 ++$as_echo_n "checking for -single_module linker flag... " >&6; } ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ rm -rf libconftest.dylib* ++ echo "int foo(void){return 1;}" > conftest.c ++ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++-dynamiclib -Wl,-single_module conftest.c" >&5 ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err ++ _lt_result=$? ++ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++ lt_cv_apple_cc_single_mod=yes ++ else ++ cat conftest.err >&5 ++ fi ++ rm -rf libconftest.dylib* ++ rm -f conftest.* ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 ++$as_echo "$lt_cv_apple_cc_single_mod" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 ++$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ lt_cv_ld_exported_symbols_list=yes ++else ++ lt_cv_ld_exported_symbols_list=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 ++$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } ++ case $host_os in ++ rhapsody* | darwin1.[012]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) # darwin 5.x on ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[012]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil='~$DSYMUTIL $lib || :' ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++ + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 ++$as_echo_n "checking how to run the C preprocessor... " >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ if test "${ac_cv_prog_CPP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" +@@ -4883,11 +7891,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -4896,68 +7900,24 @@ + #endif + Syntax error + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ++else + # Broken: fails on valid input. + continue + fi + rm -f conftest.err conftest.$ac_ext + +- # OK, works on sane cases. Now check whether non-existent headers ++ # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break +@@ -4967,7 +7927,7 @@ + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then ++if $ac_preproc_ok; then : + break + fi + +@@ -4979,8 +7939,8 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:$LINENO: result: $CPP" >&5 +-echo "${ECHO_T}$CPP" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 ++$as_echo "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do +@@ -4990,11 +7950,7 @@ + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include +@@ -5003,68 +7959,24 @@ + #endif + Syntax error + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ++else + # Broken: fails on valid input. + continue + fi + rm -f conftest.err conftest.$ac_ext + +- # OK, works on sane cases. Now check whether non-existent headers ++ # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break +@@ -5074,14 +7986,13 @@ + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : +-else +- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++if $ac_preproc_ok; then : ++ ++else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." "$LINENO" 5; } + fi + + ac_ext=c +@@ -5091,16 +8002,12 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +-if test "${ac_cv_header_stdc+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 ++$as_echo_n "checking for ANSI C header files... " >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -5115,51 +8022,23 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_header_stdc=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_cv_header_stdc=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -5169,18 +8048,14 @@ + + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -5190,16 +8065,13 @@ + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + : + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include ++#include + #if ((' ' & 0x0FF) == 0x020) + # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +@@ -5219,1473 +8091,207 @@ + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-ac_cv_header_stdc=no +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-fi +-fi +-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-echo "${ECHO_T}$ac_cv_header_stdc" >&6 ++ return 2; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ ++else ++ ac_cv_header_stdc=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 ++$as_echo "$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + + fi + + # On IRIX 5.3, sys/types and inttypes.h are conflicting. +- +- +- +- +- +- +- +- +- + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- eval "$as_ac_Header=yes" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-eval "$as_ac_Header=no" +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done + + + for ac_header in dlfcn.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-else +- # Is the header compilable? +-echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_header_compiler=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 +- +-# Is the header present? +-echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +-rm -f conftest.err conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +-## -------------------------------------------- ## +-## Report this to http://ftg.lbl.gov/checkpoint ## +-## -------------------------------------------- ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-echo "$as_me:$LINENO: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +- +-fi +-if test `eval echo '${'$as_ac_Header'}'` = yes; then ++do : ++ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default ++" ++if test "x$ac_cv_header_dlfcn_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +-ac_ext=cc +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-if test -n "$ac_tool_prefix"; then +- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +- do +- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CXX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CXX"; then +- ac_cv_prog_CXX="$CXX" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-CXX=$ac_cv_prog_CXX +-if test -n "$CXX"; then +- echo "$as_me:$LINENO: result: $CXX" >&5 +-echo "${ECHO_T}$CXX" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- test -n "$CXX" && break +- done +-fi +-if test -z "$CXX"; then +- ac_ct_CXX=$CXX +- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CXX"; then +- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CXX="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +-if test -n "$ac_ct_CXX"; then +- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +-echo "${ECHO_T}$ac_ct_CXX" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- test -n "$ac_ct_CXX" && break +-done +-test -n "$ac_ct_CXX" || ac_ct_CXX="g++" +- +- CXX=$ac_ct_CXX +-fi +- +- +-# Provide some information about the compiler. +-echo "$as_me:$LINENO:" \ +- "checking for C++ compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +- (eval $ac_compiler --version &5) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 +- (eval $ac_compiler -v &5) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 +- (eval $ac_compiler -V &5) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +- +-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +-#ifndef __GNUC__ +- choke me +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_compiler_gnu=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_compiler_gnu=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu +- +-fi +-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +-GXX=`test $ac_compiler_gnu = yes && echo yes` +-ac_test_CXXFLAGS=${CXXFLAGS+set} +-ac_save_CXXFLAGS=$CXXFLAGS +-CXXFLAGS="-g" +-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +-if test "${ac_cv_prog_cxx_g+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_prog_cxx_g=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_prog_cxx_g=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 +-if test "$ac_test_CXXFLAGS" = set; then +- CXXFLAGS=$ac_save_CXXFLAGS +-elif test $ac_cv_prog_cxx_g = yes; then +- if test "$GXX" = yes; then +- CXXFLAGS="-g -O2" +- else +- CXXFLAGS="-g" +- fi +-else +- if test "$GXX" = yes; then +- CXXFLAGS="-O2" +- else +- CXXFLAGS= +- fi +-fi +-for ac_declaration in \ +- '' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_declaration +-#include +-int +-main () +-{ +-exit (42); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-continue +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_declaration +-int +-main () +-{ +-exit (42); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-rm -f conftest* +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +-ac_ext=cc +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +-depcc="$CXX" am_compiler_list= +- +-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +- +- am_cv_CXX_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` +- fi +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +- +- case $depmode in +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break +- fi +- ;; +- none) break ;; +- esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. +- if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # (even with -Werror). So we grep stderr for any message +- # that says an option was ignored. +- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else +- am_cv_CXX_dependencies_compiler_type=$depmode +- break +- fi +- fi +- done +- +- cd .. +- rm -rf conftest.dir +-else +- am_cv_CXX_dependencies_compiler_type=none +-fi +- +-fi +-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 +-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type +- +- +- +-if +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then +- am__fastdepCXX_TRUE= +- am__fastdepCXX_FALSE='#' +-else +- am__fastdepCXX_TRUE='#' +- am__fastdepCXX_FALSE= +-fi +- +- +-ac_ext=cc +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +-if test -z "$CXXCPP"; then +- if test "${ac_cv_prog_CXXCPP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- # Double quotes because CXXCPP needs to be expanded +- for CXXCPP in "$CXX -E" "/lib/cpp" +- do +- ac_preproc_ok=false +-for ac_cxx_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- Syntax error +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether non-existent headers +- # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- # Broken: success on invalid input. +-continue +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- break +-fi +- +- done +- ac_cv_prog_CXXCPP=$CXXCPP +- +-fi +- CXXCPP=$ac_cv_prog_CXXCPP +-else +- ac_cv_prog_CXXCPP=$CXXCPP +-fi +-echo "$as_me:$LINENO: result: $CXXCPP" >&5 +-echo "${ECHO_T}$CXXCPP" >&6 +-ac_preproc_ok=false +-for ac_cxx_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- Syntax error +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether non-existent headers +- # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_cxx_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- # Broken: success on invalid input. +-continue +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : +-else +- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." >&5 +-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-fi +- +-ac_ext=cc +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- +-ac_ext=f +-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' +-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_f77_compiler_gnu +-if test -n "$ac_tool_prefix"; then +- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran +- do +- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$F77"; then +- ac_cv_prog_F77="$F77" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_F77="$ac_tool_prefix$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-F77=$ac_cv_prog_F77 +-if test -n "$F77"; then +- echo "$as_me:$LINENO: result: $F77" >&5 +-echo "${ECHO_T}$F77" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- test -n "$F77" && break +- done +-fi +-if test -z "$F77"; then +- ac_ct_F77=$F77 +- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_F77"; then +- ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_F77="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-ac_ct_F77=$ac_cv_prog_ac_ct_F77 +-if test -n "$ac_ct_F77"; then +- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +-echo "${ECHO_T}$ac_ct_F77" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- test -n "$ac_ct_F77" && break +-done +- +- F77=$ac_ct_F77 +-fi +- +- +-# Provide some information about the compiler. +-echo "$as_me:6264:" \ +- "checking for Fortran 77 compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +- (eval $ac_compiler --version &5) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 +- (eval $ac_compiler -v &5) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 +- (eval $ac_compiler -V &5) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-rm -f a.out +- +-# If we don't use `.F' as extension, the preprocessor is not run on the +-# input file. (Note that this only needs to work for GNU compilers.) +-ac_save_ext=$ac_ext +-ac_ext=F +-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 +-if test "${ac_cv_f77_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +- program main +-#ifndef __GNUC__ +- choke me +-#endif +- +- end +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_compiler_gnu=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_compiler_gnu=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_cv_f77_compiler_gnu=$ac_compiler_gnu +- +-fi +-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 +-ac_ext=$ac_save_ext +-ac_test_FFLAGS=${FFLAGS+set} +-ac_save_FFLAGS=$FFLAGS +-FFLAGS= +-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 +-if test "${ac_cv_prog_f77_g+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- FFLAGS=-g +-cat >conftest.$ac_ext <<_ACEOF +- program main +- +- end +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_prog_f77_g=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_prog_f77_g=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- +-fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 +-if test "$ac_test_FFLAGS" = set; then +- FFLAGS=$ac_save_FFLAGS +-elif test $ac_cv_prog_f77_g = yes; then +- if test "x$ac_cv_f77_compiler_gnu" = xyes; then +- FFLAGS="-g -O2" +- else +- FFLAGS="-g" +- fi +-else +- if test "x$ac_cv_f77_compiler_gnu" = xyes; then +- FFLAGS="-O2" +- else +- FFLAGS= +- fi +-fi +- +-G77=`test $ac_compiler_gnu = yes && echo yes` +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +- +-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +- +-# find the maximum length of command line arguments +-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 +-if test "${lt_cv_sys_max_cmd_len+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- i=0 +- testring="ABCD" +- +- case $build_os in +- msdosdjgpp*) +- # On DJGPP, this test can blow up pretty badly due to problems in libc +- # (any single argument exceeding 2000 bytes causes a buffer overrun +- # during glob expansion). Even if it were fixed, the result of this +- # check would be larger than it should be. +- lt_cv_sys_max_cmd_len=12288; # 12K is about right +- ;; +- +- gnu*) +- # Under GNU Hurd, this test is not required because there is +- # no limit to the length of command line arguments. +- # Libtool will interpret -1 as no limit whatsoever +- lt_cv_sys_max_cmd_len=-1; +- ;; +- +- cygwin* | mingw*) +- # On Win9x/ME, this test blows up -- it succeeds, but takes +- # about 5 minutes as the teststring grows exponentially. +- # Worse, since 9x/ME are not pre-emptively multitasking, +- # you end up with a "frozen" computer, even though with patience +- # the test eventually succeeds (with a max line length of 256k). +- # Instead, let's just punt: use the minimum linelength reported by +- # all of the supported platforms: 8192 (on NT/2K/XP). +- lt_cv_sys_max_cmd_len=8192; +- ;; +- +- amigaos*) +- # On AmigaOS with pdksh, this test takes hours, literally. +- # So we just punt and use a minimum line length of 8192. +- lt_cv_sys_max_cmd_len=8192; +- ;; +- +- *) +- # If test is not a shell built-in, we'll probably end up computing a +- # maximum length that is only half of the actual maximum length, but +- # we can't tell. +- while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ +- = "XX$testring") >/dev/null 2>&1 && +- new_result=`expr "X$testring" : ".*" 2>&1` && +- lt_cv_sys_max_cmd_len=$new_result && +- test $i != 17 # 1/2 MB should be enough +- do +- i=`expr $i + 1` +- testring=$testring$testring +- done +- testring= +- # Add a significant safety factor because C++ compilers can tack on massive +- # amounts of additional arguments before passing them to the linker. +- # It appears as though 1/2 is a usable value. +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` +- ;; +- esac +- +-fi +- +-if test -n $lt_cv_sys_max_cmd_len ; then +- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 +-else +- echo "$as_me:$LINENO: result: none" >&5 +-echo "${ECHO_T}none" >&6 +-fi +- +- +- +- +-# Check for command to grab the raw symbol name followed by C symbol from nm. +-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 +-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +-# These are sane defaults that work on at least a few old systems. +-# [They come from Ultrix. What could be older than Ultrix?!! ;)] +- +-# Character class describing NM global symbol codes. +-symcode='[BCDEGRST]' +- +-# Regexp to match symbols that can be accessed directly from C. +-sympat='\([_A-Za-z][_A-Za-z0-9]*\)' +- +-# Transform the above into a raw symbol and a C symbol. +-symxfrm='\1 \2\3 \3' +- +-# Transform an extracted symbol line into a proper C declaration +-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" +- +-# Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" +- +-# Define system-specific variables. +-case $host_os in +-aix*) +- symcode='[BCDT]' +- ;; +-cygwin* | mingw* | pw32*) +- symcode='[ABCDGISTW]' +- ;; +-hpux*) # Its linker distinguishes data from code symbols +- if test "$host_cpu" = ia64; then +- symcode='[ABCDEGRST]' +- fi +- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" +- ;; +-irix* | nonstopux*) +- symcode='[BCDEGRST]' +- ;; +-osf*) +- symcode='[BCDEGQRST]' +- ;; +-solaris* | sysv5*) +- symcode='[BDRT]' +- ;; +-sysv4) +- symcode='[DFNSTU]' +- ;; +-esac +- +-# Handle CRLF in mingw tool chain +-opt_cr= +-case $build_os in +-mingw*) +- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp +- ;; +-esac +- +-# If we're using GNU nm, then use its standard symbol codes. +-case `$NM -V 2>&1` in +-*GNU* | *'with BFD'*) +- symcode='[ABCDGIRSTW]' ;; +-esac +- +-# Try without a prefix undercore, then with it. +-for ac_symprfx in "" "_"; do +- +- # Write the raw and C identifiers. +- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" +- +- # Check to see that the pipe works correctly. +- pipe_works=no +- +- rm -f conftest* +- cat > conftest.$ac_ext <&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- # Now try to grab the symbols. +- nlist=conftest.nm +- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 +- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s "$nlist"; then +- # Try sorting and uniquifying the output. +- if sort "$nlist" | uniq > "$nlist"T; then +- mv -f "$nlist"T "$nlist" +- else +- rm -f "$nlist"T +- fi +- +- # Make sure that we snagged all the symbols we need. +- if grep ' nm_test_var$' "$nlist" >/dev/null; then +- if grep ' nm_test_func$' "$nlist" >/dev/null; then +- cat < conftest.$ac_ext +-#ifdef __cplusplus +-extern "C" { +-#endif +- +-EOF +- # Now generate the symbol file. +- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' +- +- cat <> conftest.$ac_ext +-#if defined (__STDC__) && __STDC__ +-# define lt_ptr_t void * +-#else +-# define lt_ptr_t char * +-# define const +-#endif +- +-/* The mapping between symbol names and symbols. */ +-const struct { +- const char *name; +- lt_ptr_t address; +-} +-lt_preloaded_symbols[] = +-{ +-EOF +- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext +- cat <<\EOF >> conftest.$ac_ext +- {0, (lt_ptr_t) 0} +-}; +- +-#ifdef __cplusplus +-} +-#endif +-EOF +- # Now try linking the two files. +- mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" +- LIBS="conftstm.$ac_objext" +- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext}; then +- pipe_works=yes +- fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" +- else +- echo "cannot find nm_test_func in $nlist" >&5 ++#define HAVE_DLFCN_H 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++# Set options ++ ++ ++ ++ enable_dlopen=no ++ ++ ++ enable_win32_dll=no ++ ++ ++ # Check whether --enable-shared was given. ++if test "${enable_shared+set}" = set; then : ++ enableval=$enable_shared; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_shared=yes ;; ++ no) enable_shared=no ;; ++ *) ++ enable_shared=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_shared=yes + fi +- else +- echo "cannot find nm_test_var in $nlist" >&5 +- fi +- else +- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 +- fi +- else +- echo "$progname: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- fi +- rm -f conftest* conftst* +- +- # Do not use the global_symbol_pipe unless it works. +- if test "$pipe_works" = yes; then +- break +- else +- lt_cv_sys_global_symbol_pipe= +- fi +-done +- +-fi +- +-if test -z "$lt_cv_sys_global_symbol_pipe"; then +- lt_cv_sys_global_symbol_to_cdecl= +-fi +-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +- echo "$as_me:$LINENO: result: failed" >&5 +-echo "${ECHO_T}failed" >&6 +-else +- echo "$as_me:$LINENO: result: ok" >&5 +-echo "${ECHO_T}ok" >&6 +-fi +- +-echo "$as_me:$LINENO: checking for objdir" >&5 +-echo $ECHO_N "checking for objdir... $ECHO_C" >&6 +-if test "${lt_cv_objdir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac ++else ++ enable_shared=yes ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# Check whether --with-pic was given. ++if test "${with_pic+set}" = set; then : ++ withval=$with_pic; pic_mode="$withval" ++else ++ pic_mode=default ++fi ++ ++ ++test -z "$pic_mode" && pic_mode=default ++ ++ ++ ++ ++ ++ ++ ++ # Check whether --enable-fast-install was given. ++if test "${enable_fast_install+set}" = set; then : ++ enableval=$enable_fast_install; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_fast_install=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac ++else ++ enable_fast_install=yes ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ltmain" ++ ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++test -z "$LN_S" && LN_S="ln -s" ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 ++$as_echo_n "checking for objdir... " >&6; } ++if test "${lt_cv_objdir+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + rm -f .libs 2>/dev/null + mkdir .libs 2>/dev/null +@@ -6697,14 +8303,34 @@ + fi + rmdir .libs 2>/dev/null + fi +-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +-echo "${ECHO_T}$lt_cv_objdir" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 ++$as_echo "$lt_cv_objdir" >&6; } + objdir=$lt_cv_objdir + + + + + ++cat >>confdefs.h <<_ACEOF ++#define LT_OBJDIR "$lt_cv_objdir/" ++_ACEOF ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + case $host_os in + aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some +@@ -6719,319 +8345,61 @@ + + # Sed substitution that helps us do robust quoting. It backslashifies + # metacharacters that are still active within double-quoted strings. +-Xsed='sed -e s/^X//' +-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' ++sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + + # Same as above, but do not quote variable references. +-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' ++double_quote_subst='s/\(["`\\]\)/\\\1/g' + + # Sed substitution to delay expansion of an escaped shell variable in a + # double_quote_subst'ed string. + delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + ++# Sed substitution to delay expansion of an escaped single quote. ++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' ++ + # Sed substitution to avoid accidental globbing in evaled expressions + no_glob_subst='s/\*/\\\*/g' + +-# Constants: +-rm="rm -f" +- + # Global variables: +-default_ofile=libtool ++ofile=libtool + can_build_shared=yes + +-# All known linkers require a `.a' archive for static linking (except M$VC, ++# All known linkers require a `.a' archive for static linking (except MSVC, + # which needs '.lib'). + libext=a +-ltmain="$ac_aux_dir/ltmain.sh" +-ofile="$default_ofile" ++ + with_gnu_ld="$lt_cv_prog_gnu_ld" + +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_AR+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$AR"; then +- ac_cv_prog_AR="$AR" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_AR="${ac_tool_prefix}ar" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-AR=$ac_cv_prog_AR +-if test -n "$AR"; then +- echo "$as_me:$LINENO: result: $AR" >&5 +-echo "${ECHO_T}$AR" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$ac_cv_prog_AR"; then +- ac_ct_AR=$AR +- # Extract the first word of "ar", so it can be a program name with args. +-set dummy ar; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_AR"; then +- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_AR="ar" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" +-fi +-fi +-ac_ct_AR=$ac_cv_prog_ac_ct_AR +-if test -n "$ac_ct_AR"; then +- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +-echo "${ECHO_T}$ac_ct_AR" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- AR=$ac_ct_AR +-else +- AR="$ac_cv_prog_AR" +-fi +- +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_RANLIB+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$RANLIB"; then +- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-RANLIB=$ac_cv_prog_RANLIB +-if test -n "$RANLIB"; then +- echo "$as_me:$LINENO: result: $RANLIB" >&5 +-echo "${ECHO_T}$RANLIB" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$ac_cv_prog_RANLIB"; then +- ac_ct_RANLIB=$RANLIB +- # Extract the first word of "ranlib", so it can be a program name with args. +-set dummy ranlib; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_RANLIB"; then +- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_RANLIB="ranlib" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" +-fi +-fi +-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +-if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +-echo "${ECHO_T}$ac_ct_RANLIB" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- RANLIB=$ac_ct_RANLIB +-else +- RANLIB="$ac_cv_prog_RANLIB" +-fi +- +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +-set dummy ${ac_tool_prefix}strip; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_STRIP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$STRIP"; then +- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-STRIP=$ac_cv_prog_STRIP +-if test -n "$STRIP"; then +- echo "$as_me:$LINENO: result: $STRIP" >&5 +-echo "${ECHO_T}$STRIP" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$ac_cv_prog_STRIP"; then +- ac_ct_STRIP=$STRIP +- # Extract the first word of "strip", so it can be a program name with args. +-set dummy strip; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_STRIP"; then +- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_STRIP="strip" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" +-fi +-fi +-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +-if test -n "$ac_ct_STRIP"; then +- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-echo "${ECHO_T}$ac_ct_STRIP" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- STRIP=$ac_ct_STRIP +-else +- STRIP="$ac_cv_prog_STRIP" +-fi +- +- + old_CC="$CC" + old_CFLAGS="$CFLAGS" + + # Set sane defaults for various variables +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-test -z "$AS" && AS=as + test -z "$CC" && CC=cc + test -z "$LTCC" && LTCC=$CC +-test -z "$DLLTOOL" && DLLTOOL=dlltool ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS + test -z "$LD" && LD=ld +-test -z "$LN_S" && LN_S="ln -s" ++test -z "$ac_objext" && ac_objext=o ++ ++for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++ ++ ++# Only perform the check for file, if the check method requires it + test -z "$MAGIC_CMD" && MAGIC_CMD=file +-test -z "$NM" && NM=nm +-test -z "$SED" && SED=sed +-test -z "$OBJDUMP" && OBJDUMP=objdump +-test -z "$RANLIB" && RANLIB=: +-test -z "$STRIP" && STRIP=: +-test -z "$ac_objext" && ac_objext=o +- +-# Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +-old_postinstall_cmds='chmod 644 $oldlib' +-old_postuninstall_cmds= +- +-if test -n "$RANLIB"; then +- case $host_os in +- openbsd*) +- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" +- ;; +- *) +- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" +- ;; +- esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +-fi +- +-# Only perform the check for file, if the check method requires it + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 ++$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) +@@ -7049,13 +8417,13 @@ + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) +- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else +- cat <&2 ++ cat <<_LT_EOF 1>&2 + + *** Warning: the command libtool uses to detect shared libraries, + *** $file_magic_cmd, produces output that libtool cannot recognize. +@@ -7066,7 +8434,7 @@ + *** may want to report the problem to your system manager and/or to + *** bug-libtool@gnu.org + +-EOF ++_LT_EOF + fi ;; + esac + fi +@@ -7081,19 +8449,23 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +-echo "${ECHO_T}$MAGIC_CMD" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 ++$as_echo "$MAGIC_CMD" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ ++ + + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +- echo "$as_me:$LINENO: checking for file" >&5 +-echo $ECHO_N "checking for file... $ECHO_C" >&6 +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 ++$as_echo_n "checking for file... " >&6; } ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) +@@ -7111,13 +8483,13 @@ + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) +- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else +- cat <&2 ++ cat <<_LT_EOF 1>&2 + + *** Warning: the command libtool uses to detect shared libraries, + *** $file_magic_cmd, produces output that libtool cannot recognize. +@@ -7128,7 +8500,7 @@ + *** may want to report the problem to your system manager and/or to + *** bug-libtool@gnu.org + +-EOF ++_LT_EOF + fi ;; + esac + fi +@@ -7143,12 +8515,13 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +-echo "${ECHO_T}$MAGIC_CMD" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 ++$as_echo "$MAGIC_CMD" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ + + else + MAGIC_CMD=: +@@ -7159,28 +8532,8 @@ + ;; + esac + +-enable_dlopen=no +-enable_win32_dll=no +- +-# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +-if test "${enable_libtool_lock+set}" = set; then +- enableval="$enable_libtool_lock" +- +-fi; +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +- +- +-# Check whether --with-pic or --without-pic was given. +-if test "${with_pic+set}" = set; then +- withval="$with_pic" +- pic_mode="$withval" +-else +- pic_mode=default +-fi; +-test -z "$pic_mode" && pic_mode=default +- + # Use C for the default configuration in the libtool script +-tagname= ++ + lt_save_CC="$CC" + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -7197,94 +8550,59 @@ + objext=$objext + + # Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" ++lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests +-lt_simple_link_test_code='int main(){return(0);}\n' ++lt_simple_link_test_code='int main(){return(0);}' ++ ++ ++ ++ ++ + + + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ + # Allow CC to be a program name with arguments. + compiler=$CC + +- +-# +-# Check for any special shared library compilation flags. +-# +-lt_prog_cc_shlib= +-if test "$GCC" = no; then +- case $host_os in +- sco3.2v5*) +- lt_prog_cc_shlib='-belf' +- ;; +- esac +-fi +-if test -n "$lt_prog_cc_shlib"; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5 +-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;} +- if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then : +- else +- { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 +-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} +- lt_cv_prog_cc_can_build_shared=no +- fi +-fi +- +- +-# +-# Check to make sure the static flag actually works. +-# +-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5 +-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6 +-if test "${lt_prog_compiler_static_works+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_prog_compiler_static_works=no +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $lt_prog_compiler_static" +- printf "$lt_simple_link_test_code" > conftest.$ac_ext +- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test -s conftest.err; then +- # Append any errors to the config.log. +- cat conftest.err 1>&5 +- else +- lt_prog_compiler_static_works=yes +- fi +- fi +- $rm conftest* +- LDFLAGS="$save_LDFLAGS" +- +-fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 +- +-if test x"$lt_prog_compiler_static_works" = xyes; then +- : +-else +- lt_prog_compiler_static= +-fi +- +- +- ++# Save the default compiler, since it gets overwritten when the other ++# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. ++compiler_DEFAULT=$CC ++ ++# save warnings/boilerplate of simple test code ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$RM conftest* ++ ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$RM -r conftest* ++ ++ ++if test -n "$compiler"; then + + lt_prog_compiler_no_builtin_flag= + + if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + +- +-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } ++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no +- ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ac_outfile=conftest.$ac_objext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -7292,26 +8610,28 @@ + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7298: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8616: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7302: \$? = $ac_status" >&5 ++ echo "$as_me:8620: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test ! -s conftest.err; then ++ # So say no if there are warnings other than the usual output. ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi +- $rm conftest* +- +-fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + + if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +@@ -7321,12 +8641,17 @@ + + fi + +-lt_prog_compiler_wl= ++ ++ ++ ++ ++ ++ lt_prog_compiler_wl= + lt_prog_compiler_pic= + lt_prog_compiler_static= + +-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' +@@ -7342,19 +8667,29 @@ + ;; + + amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' +- ;; +- +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac ++ ;; ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + +@@ -7364,6 +8699,25 @@ + lt_prog_compiler_pic='-fno-common' + ;; + ++ hpux*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ esac ++ ;; ++ ++ interix[3-9]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. +@@ -7371,25 +8725,18 @@ + enable_shared=no + ;; + ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic='-fPIC -shared' ++ ;; ++ + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; + +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case "$host_cpu" in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- lt_prog_compiler_pic='-fPIC' +- ;; +- esac +- ;; +- + *) + lt_prog_compiler_pic='-fPIC' + ;; +@@ -7407,7 +8754,7 @@ + fi + ;; + +- mingw* | pw32* | os2*) ++ mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' +@@ -7417,7 +8764,7 @@ + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. +- case "$host_cpu" in ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; +@@ -7435,24 +8782,73 @@ + lt_prog_compiler_static='-non_shared' + ;; + +- newsos6) +- lt_prog_compiler_pic='-KPIC' +- lt_prog_compiler_static='-Bstatic' +- ;; +- +- linux*) +- case $CC in +- icc* | ecc*) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ case $cc_basename in ++ # old Intel for x86_64 which still supported -KPIC. ++ ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; ++ # icc used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ icc* | ifort*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ # Lahey Fortran 8.1. ++ lf95*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='--shared' ++ lt_prog_compiler_static='--static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fpic' ++ lt_prog_compiler_static='-Bstatic' ++ ;; + ccc*) + lt_prog_compiler_wl='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; +- esac ++ xl*) ++ # IBM XL C 8.0/Fortran 10.1 on PPC ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-qpic' ++ lt_prog_compiler_static='-qstaticlink' ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ ++ newsos6) ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) +@@ -7461,15 +8857,19 @@ + lt_prog_compiler_static='-non_shared' + ;; + +- sco3.2v5*) +- lt_prog_compiler_pic='-Kpic' +- lt_prog_compiler_static='-dn' ++ rdos*) ++ lt_prog_compiler_static='-non_shared' + ;; + + solaris*) +- lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ lt_prog_compiler_wl='-Qoption ld ';; ++ *) ++ lt_prog_compiler_wl='-Wl,';; ++ esac + ;; + + sunos4*) +@@ -7478,7 +8878,7 @@ + lt_prog_compiler_static='-Bstatic' + ;; + +- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++ sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' +@@ -7491,6 +8891,17 @@ + fi + ;; + ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ unicos*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_can_build_shared=no ++ ;; ++ + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' +@@ -7502,22 +8913,35 @@ + esac + fi + +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic" >&6 ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ lt_prog_compiler_pic= ++ ;; ++ *) ++ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ++ ;; ++esac ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 ++$as_echo "$lt_prog_compiler_pic" >&6; } ++ ++ ++ ++ ++ + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic"; then +- +-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 +-if test "${lt_prog_compiler_pic_works+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_prog_compiler_pic_works=no +- ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic_works=no ++ ac_outfile=conftest.$ac_objext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -7525,28 +8949,30 @@ + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7531: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8955: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7535: \$? = $ac_status" >&5 ++ echo "$as_me:8959: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test ! -s conftest.err; then +- lt_prog_compiler_pic_works=yes ++ # So say no if there are warnings other than the usual output. ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_pic_works=yes + fi + fi +- $rm conftest* +- +-fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 +- +-if test x"$lt_prog_compiler_pic_works" = xyes; then ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 ++$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } ++ ++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; +@@ -7557,27 +8983,70 @@ + fi + + fi +-case "$host_os" in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- lt_prog_compiler_pic= +- ;; +- *) +- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" +- ;; +-esac +- +-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ ++ ++ ++ ++ ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_static_works=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&5 ++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_static_works=yes ++ fi ++ else ++ lt_cv_prog_compiler_static_works=yes ++ fi ++ fi ++ $RM -r conftest* ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 ++$as_echo "$lt_cv_prog_compiler_static_works" >&6; } ++ ++if test x"$lt_cv_prog_compiler_static_works" = xyes; then ++ : ++else ++ lt_prog_compiler_static= ++fi ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 ++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +- $rm -r conftest 2>/dev/null ++ $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or +@@ -7585,84 +9054,151 @@ + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7591: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9060: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7595: \$? = $ac_status" >&5 ++ echo "$as_me:9064: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +- if test ! -s out/conftest.err; then ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi +- chmod u+w . +- $rm conftest* ++ chmod u+w . 2>&5 ++ $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out + cd .. +- rmdir conftest +- $rm conftest* +- +-fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 ++ $RM -r conftest ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o" >&6; } ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 ++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_c_o=no ++ $RM -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:9115: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&5 ++ echo "$as_me:9119: \$? = $ac_status" >&5 ++ if (exit $ac_status) && test -s out/conftest2.$ac_objext ++ then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_c_o=yes ++ fi ++ fi ++ chmod u+w . 2>&5 ++ $RM conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out ++ cd .. ++ $RM -r conftest ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o" >&6; } ++ ++ + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 ++$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes +- $rm conftest* ++ $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 ++$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi + else + need_locks=no + fi + +-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= + allow_undefined_flag= +- enable_shared_with_static_runtimes=no ++ always_export_symbols=no + archive_cmds= + archive_expsym_cmds= +- old_archive_From_new_cmds= +- old_archive_from_expsyms_cmds= ++ compiler_needs_object=no ++ enable_shared_with_static_runtimes=no + export_dynamic_flag_spec= +- whole_archive_flag_spec= +- thread_safe_flag_spec= ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ hardcode_automatic=no ++ hardcode_direct=no ++ hardcode_direct_absolute=no + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= + hardcode_libdir_separator= +- hardcode_direct=no + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported ++ inherit_rpath=no + link_all_deplibs=unknown +- hardcode_automatic=no + module_cmds= + module_expsym_cmds= +- always_export_symbols=no +- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ old_archive_from_new_cmds= ++ old_archive_from_expsyms_cmds= ++ thread_safe_flag_spec= ++ whole_archive_flag_spec= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms= +@@ -7670,16 +9206,17 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms="_GLOBAL_OFFSET_TABLE_" ++ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + + case $host_os in +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. +@@ -7687,9 +9224,16 @@ + with_gnu_ld=no + fi + ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs=no ++ ;; + esac + + ld_shlibs=yes +@@ -7697,13 +9241,35 @@ + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ export_dynamic_flag_spec='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then ++ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ whole_archive_flag_spec= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac ++ + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no +- cat <&2 ++ cat <<_LT_EOF 1>&2 + + *** Warning: the GNU linker, at least up to release 2.9.1, is reported + *** to be unable to reliably create shared libraries on AIX. +@@ -7711,26 +9277,27 @@ + *** really care for shared libraries, you may want to modify your PATH + *** so that a non-GNU linker is found, and then restart. + +-EOF ++_LT_EOF + fi + ;; + + amigaos*) +- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_minus_L=yes +- +- # Samuel A. Falvo II reports +- # that the semantics of dynamic libraries on AmigaOS, at least up +- # to version 4, is to share data among multiple programs linked +- # with the same dynamic library. Since this doesn't match the +- # behavior of shared libraries on other platforms, we can't use +- # them. +- ld_shlibs=no ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='' ++ ;; ++ m68k) ++ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_minus_L=yes ++ ;; ++ esac + ;; + + beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME +@@ -7740,17 +9307,17 @@ + fi + ;; + +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, ++ cygwin* | mingw* | pw32* | cegcc*) ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes +- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' +- +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +@@ -7759,14 +9326,99 @@ + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; + +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ interix[3-9]*) ++ hardcode_direct=no ++ hardcode_shlibpath_var=no ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) ++ tmp_diet=no ++ if test "$host_os" = linux-dietlibc; then ++ case $cc_basename in ++ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) ++ esac ++ fi ++ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ ++ && test "$tmp_diet" = no ++ then ++ tmp_addflag= ++ tmp_sharedflag='-shared' ++ case $cc_basename,$host_cpu in ++ pgcc*) # Portland Group C compiler ++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ ifc* | ifort*) # Intel Fortran compiler ++ tmp_addflag=' -nofor_main' ;; ++ lf95*) # Lahey Fortran 8.1 ++ whole_archive_flag_spec= ++ tmp_sharedflag='--shared' ;; ++ xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) ++ tmp_sharedflag='-qmkshrobj' ++ tmp_addflag= ;; ++ esac ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ compiler_needs_object=yes ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ esac ++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ++ if test "x$supports_anon_versioning" = xyes; then ++ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ ++ case $cc_basename in ++ xlf*) ++ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself ++ whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' ++ hardcode_libdir_flag_spec= ++ hardcode_libdir_flag_spec_ld='-rpath $libdir' ++ archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ if test "x$supports_anon_versioning" = xyes; then ++ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ fi ++ ;; ++ esac ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ ++ netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +@@ -7775,10 +9427,10 @@ + fi + ;; + +- solaris* | sysv5*) +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ++ solaris*) ++ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + ld_shlibs=no +- cat <&2 ++ cat <<_LT_EOF 1>&2 + + *** Warning: The releases 2.8.* of the GNU linker cannot reliably + *** create shared libraries on Solaris systems. Therefore, libtool +@@ -7787,8 +9439,8 @@ + *** your PATH or compiler configuration so that the native linker is + *** used, and then restart. + +-EOF +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++_LT_EOF ++ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else +@@ -7796,6 +9448,37 @@ + fi + ;; + ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) ++ ld_shlibs=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ ;; ++ *) ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ esac ++ ;; ++ + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= +@@ -7803,33 +9486,8 @@ + hardcode_shlibpath_var=no + ;; + +- linux*) +- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then +- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_cmds="$tmp_archive_cmds" +- supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in +- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac +- if test $supports_anon_versioning = yes; then +- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +-$echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- else +- archive_expsym_cmds="$tmp_archive_cmds" +- fi +- else +- ld_shlibs=no +- fi +- ;; +- +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ *) ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else +@@ -7838,16 +9496,11 @@ + ;; + esac + +- if test "$ld_shlibs" = yes; then +- runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' +- export_dynamic_flag_spec='${wl}--export-dynamic' +- # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- whole_archive_flag_spec= +- fi ++ if test "$ld_shlibs" = no; then ++ runpath_var= ++ hardcode_libdir_flag_spec= ++ export_dynamic_flag_spec= ++ whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) +@@ -7859,14 +9512,14 @@ + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes +- if test "$GCC" = yes && test -z "$link_static_flag"; then ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -7876,23 +9529,24 @@ + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else +- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi + done ++ ;; + esac + + exp_sym_flag='-bexport' +@@ -7907,46 +9561,54 @@ + + archive_cmds='' + hardcode_direct=yes ++ hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes ++ file_list_spec='${wl}-f,' + + if test "$GCC" = yes; then +- case $host_os in aix4.012|aix4.012.*) ++ case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null ++ if test -f "$collect2name" && ++ strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then +- # We have reworked collect2 +- hardcode_direct=yes ++ # We have reworked collect2 ++ : + else +- # We have old collect2 +- hardcode_direct=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- hardcode_minus_L=yes +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_libdir_separator= ++ # We have old collect2 ++ hardcode_direct=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ hardcode_minus_L=yes ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_libdir_separator= + fi ++ ;; + esac + shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else +- if test "$aix_use_runtimelinking" = yes; then ++ if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' +- fi ++ fi + fi + fi + ++ export_dynamic_flag_spec='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes +@@ -7954,118 +9616,76 @@ + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else ++ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" ++ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" +- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" ++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -8073,30 +9693,35 @@ + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' +- # -bexpall does not export symbols beginning with underscore (_) +- always_export_symbols=yes + # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec=' ' ++ whole_archive_flag_spec='$convenience' + archive_cmds_need_lc=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ # This is similar to how AIX traditionally builds its shared libraries. ++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) +- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_minus_L=yes +- # see comment about different semantics on the GNU ld section +- ld_shlibs=no +- ;; +- +- bsdi4*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='' ++ ;; ++ m68k) ++ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_minus_L=yes ++ ;; ++ esac ++ ;; ++ ++ bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; + +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is +@@ -8106,65 +9731,42 @@ + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext=".dll" ++ shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. +- archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. +- old_archive_From_new_cmds='true' ++ old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. +- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes + ;; + + darwin* | rhapsody*) +- if test "$GXX" = yes ; then +- archive_cmds_need_lc=no +- case "$host_os" in +- rhapsody* | darwin1.[012]) +- allow_undefined_flag='-undefined suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- allow_undefined_flag='-flat_namespace -undefined suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- allow_undefined_flag='-flat_namespace -undefined suppress' +- ;; +- 10.*) +- allow_undefined_flag='-undefined dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- lt_int_apple_cc_single_mod=no +- output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes +- fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- hardcode_direct=no +- hardcode_automatic=yes +- hardcode_shlibpath_var=unsupported +- whole_archive_flag_spec='-all_load $convenience' +- link_all_deplibs=yes +- else +- ld_shlibs=no +- fi ++ ++ ++ archive_cmds_need_lc=no ++ hardcode_direct=no ++ hardcode_automatic=yes ++ hardcode_shlibpath_var=unsupported ++ whole_archive_flag_spec='' ++ link_all_deplibs=yes ++ allow_undefined_flag="$_lt_dar_allow_undefined" ++ case $cc_basename in ++ ifort*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test "$_lt_dar_can_shared" = "yes"; then ++ output_verbose_link_cmd=echo ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ ++ else ++ ld_shlibs=no ++ fi ++ + ;; + + dgux*) +@@ -8197,7 +9799,7 @@ + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu) ++ freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes +@@ -8206,9 +9808,9 @@ + + hpux9*) + if test "$GCC" = yes; then +- archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else +- archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: +@@ -8220,48 +9822,63 @@ + export_dynamic_flag_spec='${wl}-E' + ;; + +- hpux10* | hpux11*) ++ hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*|ia64*) ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_flag_spec_ld='+b $libdir' ++ hardcode_libdir_separator=: ++ hardcode_direct=yes ++ hardcode_direct_absolute=yes ++ export_dynamic_flag_spec='${wl}-E' ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; ++ ia64*) ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; + *) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else +- case "$host_cpu" in +- hppa*64*|ia64*) +- archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*) +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' +- hardcode_libdir_flag_spec_ld='+b $libdir' +- hardcode_libdir_separator=: ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) + hardcode_direct=no + hardcode_shlibpath_var=no + ;; +- ia64*) +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_direct=no +- hardcode_shlibpath_var=no +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L=yes +- ;; + *) +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator=: + hardcode_direct=yes ++ hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, +@@ -8274,18 +9891,36 @@ + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ # Try to use the -exported_symbol ld option, if it does not ++ # work, assume that -exports_file does not work either and ++ # implicitly export all symbols. ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++int foo(void) {} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$save_LDFLAGS" + else +- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- hardcode_libdir_flag_spec_ld='-rpath $libdir' +- fi ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' ++ fi ++ archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: ++ inherit_rpath=yes + link_all_deplibs=yes + ;; + +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF +@@ -8303,24 +9938,33 @@ + hardcode_shlibpath_var=no + ;; + ++ *nto* | *qnx*) ++ ;; ++ + openbsd*) +- hardcode_direct=yes +- hardcode_shlibpath_var=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +- export_dynamic_flag_spec='${wl}-E' ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ hardcode_direct_absolute=yes ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec='${wl}-E' ++ else ++ case $host_os in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi + else +- case $host_os in +- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-R$libdir' +- ;; +- *) +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +- ;; +- esac ++ ld_shlibs=no + fi + ;; + +@@ -8328,18 +9972,19 @@ + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported +- archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +- old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' +- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- fi ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ fi ++ archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; +@@ -8347,45 +9992,59 @@ + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' +- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ ++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi ++ archive_cmds_need_lc='no' + hardcode_libdir_separator=: + ;; + +- sco3.2v5*) +- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var=no +- export_dynamic_flag_spec='${wl}-Bexport' +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- ;; +- + solaris*) +- no_undefined_flag=' -z text' ++ no_undefined_flag=' -z defs' + if test "$GCC" = yes; then +- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++ wlarc='${wl}' ++ archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else +- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++ case `$CC -V 2>&1` in ++ *"Compilers 5.0"*) ++ wlarc='' ++ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ++ ;; ++ *) ++ wlarc='${wl}' ++ archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ ;; ++ esac + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; +- *) # Supported since Solaris 2.6 (maybe 2.5.1?) +- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; ++ *) ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but is careful enough not to reorder. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ if test "$GCC" = yes; then ++ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ++ fi ++ ;; + esac + link_all_deplibs=yes + ;; +@@ -8442,36 +10101,45 @@ + fi + ;; + +- sysv4.2uw2*) +- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct=yes +- hardcode_minus_L=no +- hardcode_shlibpath_var=no +- hardcode_runpath_var=yes +- runpath_var=LD_RUN_PATH +- ;; +- +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) +- no_undefined_flag='${wl}-z ${wl}text' +- if test "$GCC" = yes; then +- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- runpath_var='LD_RUN_PATH' +- hardcode_shlibpath_var=no +- ;; +- +- sysv5*) +- no_undefined_flag=' -z text' +- # $CC -shared without GNU ld will not create a library from C++ +- # object files and a static libstdc++, better avoid it by now +- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' +- hardcode_libdir_flag_spec= ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) ++ no_undefined_flag='${wl}-z,text' ++ archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ no_undefined_flag='${wl}-z,text' ++ allow_undefined_flag='${wl}-z,nodefs' ++ archive_cmds_need_lc=no ++ hardcode_shlibpath_var=no ++ hardcode_libdir_flag_spec='${wl}-R,$libdir' ++ hardcode_libdir_separator=':' ++ link_all_deplibs=yes ++ export_dynamic_flag_spec='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi + ;; + + uts4*) +@@ -8484,16 +10152,35 @@ + ld_shlibs=no + ;; + esac +- fi +- +-echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +-echo "${ECHO_T}$ld_shlibs" >&6 ++ ++ if test x$host_vendor = xsni; then ++ case $host in ++ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++ export_dynamic_flag_spec='${wl}-Blargedynsym' ++ ;; ++ esac ++ fi ++ fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 ++$as_echo "$ld_shlibs" >&6; } + test "$ld_shlibs" = no && can_build_shared=no + +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi ++with_gnu_ld=$with_gnu_ld ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + # + # Do we need to explicitly link libc? +@@ -8512,21 +10199,22 @@ + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 +- $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 ++$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } ++ $RM conftest* ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } 2>conftest.err; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl ++ pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= +@@ -8534,11 +10222,11 @@ + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 +- (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 ++ (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } + then + archive_cmds_need_lc=no + else +@@ -8548,21 +10236,229 @@ + else + cat conftest.err 1>&5 + fi +- $rm conftest* +- echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc" >&6 +- ;; +- esac +- fi +- ;; +-esac +- +-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 ++ $RM conftest* ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 ++$as_echo "$archive_cmds_need_lc" >&6; } ++ ;; ++ esac ++ fi ++ ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 ++$as_echo_n "checking dynamic linker characteristics... " >&6; } ++ ++if test "$GCC" = yes; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # Ok, now we have the path, separated by spaces, we can step through it ++ # and add multilib dir if necessary. ++ lt_tmp_lt_search_path_spec= ++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ for lt_sys_path in $lt_search_path_spec; do ++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++ else ++ test -d "$lt_sys_path" && \ ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++ fi ++ done ++ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' ++BEGIN {RS=" "; FS="/|\n";} { ++ lt_foo=""; ++ lt_count=0; ++ for (lt_i = NF; lt_i > 0; lt_i--) { ++ if ($lt_i != "" && $lt_i != ".") { ++ if ($lt_i == "..") { ++ lt_count++; ++ } else { ++ if (lt_count == 0) { ++ lt_foo="/" $lt_i lt_foo; ++ } else { ++ lt_count--; ++ } ++ } ++ } ++ } ++ if (lt_foo != "") { lt_freq[lt_foo]++; } ++ if (lt_freq[lt_foo] == 1) { print lt_foo; } ++}'` ++ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -8572,20 +10468,6 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -8603,7 +10485,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -8622,7 +10504,7 @@ + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no +@@ -8648,9 +10530,18 @@ + ;; + + amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ case $host_cpu in ++ powerpc) ++ # Since July 2007 AmigaOS4 officially supports .so libraries. ++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ ;; ++ m68k) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ esac + ;; + + beos*) +@@ -8659,7 +10550,7 @@ + shlibpath_var=LIBRARY_PATH + ;; + +-bsdi4*) ++bsdi[45]*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -8673,24 +10564,28 @@ + # libtool to hard-code these into programs + ;; + +-cygwin* | mingw* | pw32*) ++cygwin* | mingw* | pw32* | cegcc*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname' ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname~ ++ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++ fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ +- $rm \$dlpath' ++ $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in +@@ -8699,25 +10594,25 @@ + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; +- mingw*) ++ mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then ++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; +@@ -8736,17 +10631,13 @@ + version_type=darwin + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -8763,20 +10654,17 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- +-freebsd*) +- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[123]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +@@ -8794,14 +10682,19 @@ + freebsd2*) + shlibpath_overrides_runpath=yes + ;; +- freebsd3.01* | freebsdelf3.01*) ++ freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +- *) # from 3.2 on ++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ ++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; + esac + ;; + +@@ -8821,9 +10714,9 @@ + version_type=sunos + need_lib_prefix=no + need_version=no +- case "$host_cpu" in ++ case $host_cpu in + ia64*) +- shrext='.so' ++ shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH +@@ -8837,19 +10730,19 @@ + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; +- hppa*64*) +- shrext='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext='.sl' ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +@@ -8861,6 +10754,18 @@ + postinstall_cmds='chmod 555 $lib' + ;; + ++interix[3-9]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ + irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; +@@ -8904,7 +10809,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -8913,6 +10818,32 @@ + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no ++ # Some binutils ld are patched to set DT_RUNPATH ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ ++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : ++ shlibpath_overrides_runpath=yes ++fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir ++ + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. +@@ -8920,8 +10851,8 @@ + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -8933,7 +10864,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -8942,14 +10873,14 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' +@@ -8970,24 +10901,31 @@ + shlibpath_overrides_runpath=yes + ;; + +-nto-qnx*) +- version_type=linux ++*nto* | *qnx*) ++ version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='ldqnx.so' + ;; + + openbsd*) + version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no +- need_version=yes ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no +@@ -9003,7 +10941,7 @@ + + os2*) + libname_spec='$name' +- shrext=".dll" ++ shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' +@@ -9021,11 +10959,8 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +-sco3.2v5*) +- version_type=osf +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH ++rdos*) ++ dynamic_linker=no + ;; + + solaris*) +@@ -9053,7 +10988,7 @@ + need_version=yes + ;; + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' +@@ -9062,7 +10997,6 @@ + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) +@@ -9086,6 +11020,39 @@ + fi + ;; + ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ ++tpf*) ++ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ + uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -9097,23 +11064,121 @@ + dynamic_linker=no + ;; + esac +-echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 ++$as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + +-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi ++ ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++fi ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 ++$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action= +-if test -n "$hardcode_libdir_flag_spec" || \ +- test -n "$runpath_var " || \ +- test "X$hardcode_automatic"="Xyes" ; then +- +- # We can hardcode non-existant directories. ++if test -n "$hardcode_libdir_flag_spec" || ++ test -n "$runpath_var" || ++ test "X$hardcode_automatic" = "Xyes" ; then ++ ++ # We can hardcode non-existent directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && ++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink +@@ -9126,10 +11191,11 @@ + # directories. + hardcode_action=unsupported + fi +-echo "$as_me:$LINENO: result: $hardcode_action" >&5 +-echo "${ECHO_T}$hardcode_action" >&6 +- +-if test "$hardcode_action" = relink; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 ++$as_echo "$hardcode_action" >&6; } ++ ++if test "$hardcode_action" = relink || ++ test "$inherit_rpath" = yes; then + # Fast installation is not supported + enable_fast_install=no + elif test "$shlibpath_overrides_runpath" = yes || +@@ -9138,36 +11204,12 @@ + enable_fast_install=needless + fi + +-striplib= +-old_striplib= +-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then +- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" +- test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +-else +-# FIXME - insert some real tests, host_os isn't really good enough +- case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- ;; +- *) +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +- ;; +- esac +-fi +- +-if test "x$enable_dlopen" != xyes; then ++ ++ ++ ++ ++ ++ if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +@@ -9182,83 +11224,55 @@ + lt_cv_dlopen_self=yes + ;; + +- mingw* | pw32*) ++ mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= +- ;; ++ ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= +- ;; ++ ;; + + darwin*) + # if libdl is installed we need to link against it +- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char dlopen (); + int + main () + { +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dl_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++ ac_cv_lib_dl_dlopen=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +-if test $ac_cv_lib_dl_dlopen = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else + +@@ -9268,462 +11282,172 @@ + + fi + +- ;; ++ ;; + + *) +- echo "$as_me:$LINENO: checking for shl_load" >&5 +-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 +-if test "${ac_cv_func_shl_load+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define shl_load to an innocuous variant, in case declares shl_load. +- For example, HP-UX 11i declares gettimeofday. */ +-#define shl_load innocuous_shl_load +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shl_load (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef shl_load +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char shl_load (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_shl_load) || defined (__stub___shl_load) +-choke me +-#else +-char (*f) () = shl_load; +-#endif +-#ifdef __cplusplus +-} +-#endif +- +-int +-main () +-{ +-return f != shl_load; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_shl_load=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_func_shl_load=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +-if test $ac_cv_func_shl_load = yes; then ++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" ++if test "x$ac_cv_func_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" + else +- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 +-if test "${ac_cv_lib_dld_shl_load+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 ++$as_echo_n "checking for shl_load in -ldld... " >&6; } ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char shl_load (); + int + main () + { +-shl_load (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++return shl_load (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dld_shl_load=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++ ac_cv_lib_dld_shl_load=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +-if test $ac_cv_lib_dld_shl_load = yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" +-else +- echo "$as_me:$LINENO: checking for dlopen" >&5 +-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 +-if test "${ac_cv_func_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define dlopen to an innocuous variant, in case declares dlopen. +- For example, HP-UX 11i declares gettimeofday. */ +-#define dlopen innocuous_dlopen +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char dlopen (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef dlopen +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_dlopen) || defined (__stub___dlopen) +-choke me +-#else +-char (*f) () = dlopen; +-#endif +-#ifdef __cplusplus +-} +-#endif +- +-int +-main () +-{ +-return f != dlopen; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_func_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +-if test $ac_cv_func_dlopen = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 ++$as_echo "$ac_cv_lib_dld_shl_load" >&6; } ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" ++else ++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" ++if test "x$ac_cv_func_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" + else +- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char dlopen (); + int + main () + { +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dl_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++ ac_cv_lib_dl_dlopen=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +-if test $ac_cv_lib_dl_dlopen = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else +- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 +-if test "${ac_cv_lib_svld_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 ++$as_echo_n "checking for dlopen in -lsvld... " >&6; } ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsvld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char dlopen (); + int + main () + { +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_svld_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++ ac_cv_lib_svld_dlopen=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +-if test $ac_cv_lib_svld_dlopen = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 ++$as_echo "$ac_cv_lib_svld_dlopen" >&6; } ++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else +- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 +-if test "${ac_cv_lib_dld_dld_link+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 ++$as_echo_n "checking for dld_link in -ldld... " >&6; } ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char dld_link (); + int + main () + { +-dld_link (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++return dld_link (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dld_dld_link=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++ ac_cv_lib_dld_dld_link=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +-if test $ac_cv_lib_dld_dld_link = yes; then +- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 ++$as_echo "$ac_cv_lib_dld_dld_link" >&6; } ++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : ++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + + +@@ -9756,23 +11480,23 @@ + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" +- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + +- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 +-if test "${lt_cv_dlopen_self+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 ++$as_echo_n "checking whether a program can dlopen itself... " >&6; } ++if test "${lt_cv_dlopen_self+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < conftest.$ac_ext <<_LT_EOF ++#line 11499 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -9813,10 +11537,6 @@ + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -9829,21 +11549,23 @@ + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } +- +- exit (status); +-} +-EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ else ++ puts (dlerror ()); ++ ++ return status; ++} ++_LT_EOF ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; +- x$lt_unknown|x*) lt_cv_dlopen_self=no ;; ++ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed +@@ -9854,23 +11576,23 @@ + + + fi +-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 ++$as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then +- LDFLAGS="$LDFLAGS $link_static_flag" +- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 +-if test "${lt_cv_dlopen_self_static+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 ++$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } ++if test "${lt_cv_dlopen_self_static+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < conftest.$ac_ext <<_LT_EOF ++#line 11595 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -9911,10 +11633,6 @@ + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -9927,21 +11645,23 @@ + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } +- +- exit (status); +-} +-EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ else ++ puts (dlerror ()); ++ ++ return status; ++} ++_LT_EOF ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; +- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; ++ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed +@@ -9952,8 +11672,8 @@ + + + fi +-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 ++$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS="$save_CPPFLAGS" +@@ -9974,552 +11694,103 @@ + fi + + +-# Report which librarie types wil actually be built +-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 +-echo "$as_me:$LINENO: result: $can_build_shared" >&5 +-echo "${ECHO_T}$can_build_shared" >&6 +- +-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +-test "$can_build_shared" = "no" && enable_shared=no +- +-# On AIX, shared libraries and static libraries use the same namespace, and +-# are all built from PIC. +-case "$host_os" in +-aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; +- +-aix4*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi +- ;; +- darwin* | rhapsody*) +- if test "$GCC" = yes; then +- archive_cmds_need_lc=no +- case "$host_os" in +- rhapsody* | darwin1.[012]) +- allow_undefined_flag='-undefined suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- allow_undefined_flag='-flat_namespace -undefined suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- allow_undefined_flag='-flat_namespace -undefined suppress' +- ;; +- 10.*) +- allow_undefined_flag='-undefined dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- output_verbose_link_cmd='echo' +- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' +- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- hardcode_direct=no +- hardcode_automatic=yes +- hardcode_shlibpath_var=unsupported +- whole_archive_flag_spec='-all_load $convenience' +- link_all_deplibs=yes +- else +- ld_shlibs=no +- fi +- ;; +-esac +-echo "$as_me:$LINENO: result: $enable_shared" >&5 +-echo "${ECHO_T}$enable_shared" >&6 +- +-echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +-# Make sure either enable_shared or enable_static is yes. +-test "$enable_shared" = yes || enable_static=yes +-echo "$as_me:$LINENO: result: $enable_static" >&5 +-echo "${ECHO_T}$enable_static" >&6 +- +-# The else clause should only fire when bootstrapping the +-# libtool distribution, otherwise you forgot to ship ltmain.sh +-# with your package, and you will get complaints that there are +-# no rules to generate ltmain.sh. +-if test -f "$ltmain"; then +- # See if we are running on zsh, and set the options which allow our commands through +- # without removal of \ escapes. +- if test -n "${ZSH_VERSION+set}" ; then +- setopt NO_GLOB_SUBST +- fi +- # Now quote all the things that may contain metacharacters while being +- # careful not to overquote the AC_SUBSTed values. We take copies of the +- # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \ +- SED SHELL STRIP \ +- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ +- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ +- deplibs_check_method reload_flag reload_cmds need_locks \ +- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ +- lt_cv_sys_global_symbol_to_c_name_address \ +- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ +- old_postinstall_cmds old_postuninstall_cmds \ +- compiler \ +- CC \ +- LD \ +- lt_prog_compiler_wl \ +- lt_prog_compiler_pic \ +- lt_prog_compiler_static \ +- lt_prog_compiler_no_builtin_flag \ +- export_dynamic_flag_spec \ +- thread_safe_flag_spec \ +- whole_archive_flag_spec \ +- enable_shared_with_static_runtimes \ +- old_archive_cmds \ +- old_archive_from_new_cmds \ +- predep_objects \ +- postdep_objects \ +- predeps \ +- postdeps \ +- compiler_lib_search_path \ +- archive_cmds \ +- archive_expsym_cmds \ +- postinstall_cmds \ +- postuninstall_cmds \ +- old_archive_from_expsyms_cmds \ +- allow_undefined_flag \ +- no_undefined_flag \ +- export_symbols_cmds \ +- hardcode_libdir_flag_spec \ +- hardcode_libdir_flag_spec_ld \ +- hardcode_libdir_separator \ +- hardcode_automatic \ +- module_cmds \ +- module_expsym_cmds \ +- lt_cv_prog_compiler_c_o \ +- exclude_expsyms \ +- include_expsyms; do +- +- case $var in +- old_archive_cmds | \ +- old_archive_from_new_cmds | \ +- archive_cmds | \ +- archive_expsym_cmds | \ +- module_cmds | \ +- module_expsym_cmds | \ +- old_archive_from_expsyms_cmds | \ +- export_symbols_cmds | \ +- extract_expsyms_cmds | reload_cmds | finish_cmds | \ +- postinstall_cmds | postuninstall_cmds | \ +- old_postinstall_cmds | old_postuninstall_cmds | \ +- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) +- # Double-quote double-evaled strings. +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" +- ;; +- *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" +- ;; +- esac +- done +- +- case $lt_echo in +- *'\$0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` +- ;; +- esac +- +-cfgfile="${ofile}T" +- trap "$rm \"$cfgfile\"; exit 1" 1 2 15 +- $rm -f "$cfgfile" +- { echo "$as_me:$LINENO: creating $ofile" >&5 +-echo "$as_me: creating $ofile" >&6;} +- +- cat <<__EOF__ >> "$cfgfile" +-#! $SHELL +- +-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) +-# NOTE: Changes made to this file will be lost: look at ltmain.sh. +-# +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +-# Free Software Foundation, Inc. +-# +-# This file is part of GNU Libtool: +-# Originally by Gordon Matzigkeit , 1996 +-# +-# 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. +- +-# A sed program that does not truncate output. +-SED=$lt_SED +- +-# Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="$SED -e s/^X//" +- +-# The HP-UX ksh and POSIX shell print the target directory to stdout +-# if CDPATH is set. +-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +- +-# The names of the tagged configurations supported by this script. +-available_tags= +- +-# ### BEGIN LIBTOOL CONFIG +- +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +- +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL +- +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared +- +-# Whether or not to build static libraries. +-build_old_libs=$enable_static +- +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc +- +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes +- +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install +- +-# The host system. +-host_alias=$host_alias +-host=$host +- +-# An echo program that does not interpret backslashes. +-echo=$lt_echo +- +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS +- +-# A C compiler. +-LTCC=$lt_LTCC +- +-# A language-specific compiler. +-CC=$lt_compiler +- +-# Is the compiler the GNU C compiler? +-with_gcc=$GCC +- +-# An ERE matcher. +-EGREP=$lt_EGREP +- +-# The linker used to build libraries. +-LD=$lt_LD +- +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S +- +-# A BSD-compatible nm program. +-NM=$lt_NM +- +-# A symbol stripping program +-STRIP=$lt_STRIP +- +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD +- +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" +- +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" +- +-# Used on cygwin: assembler. +-AS=$lt_AS +- +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir +- +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +- +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl +- +-# Object file suffix (normally "o"). +-objext="$ac_objext" +- +-# Old archive suffix (normally "a"). +-libext="$libext" +- +-# Shared library suffix (normally ".so"). +-shrext='$shrext' +- +-# Executable file suffix (normally ""). +-exeext="$exeext" +- +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic +-pic_mode=$pic_mode +- +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len +- +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o +- +-# Must we lock files when doing compilation ? +-need_locks=$lt_need_locks +- +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix +- +-# Do we need a version for libraries? +-need_version=$need_version +- +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +- +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self +- +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static +- +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static +- +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag +- +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec +- +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec +- +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_thread_safe_flag_spec +- +-# Library versioning type. +-version_type=$version_type +- +-# Format of library name prefix. +-libname_spec=$lt_libname_spec +- +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec +- +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec +- +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_old_archive_cmds +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds +- +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds +- +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds +- +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_archive_cmds +-archive_expsym_cmds=$lt_archive_expsym_cmds +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds +- +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_module_cmds +-module_expsym_cmds=$lt_module_expsym_cmds +- +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_predep_objects +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_postdep_objects +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_predeps +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_postdeps +- +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path +- +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method +- +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd +- +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag +- +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag +- +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds +- +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval +- +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +- +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +- +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +- +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var +- +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var +- +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath +- +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action +- +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs +- +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec +- +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld +- +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator +- +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$hardcode_direct +- +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$hardcode_minus_L +- +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var +- +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$hardcode_automatic +- +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" +- +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs +- +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +- +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +- +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path" +- +-# Set to yes if exported symbols are required. +-always_export_symbols=$always_export_symbols +- +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds +- +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds +- +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms +- +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms +- +-# ### END LIBTOOL CONFIG +- +-__EOF__ +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++striplib= ++old_striplib= ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 ++$as_echo_n "checking whether stripping libraries is possible... " >&6; } ++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then ++ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++ test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++else ++# FIXME - insert some real tests, host_os isn't really good enough ++ case $host_os in ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ old_striplib="$STRIP -S" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ fi ++ ;; ++ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ;; ++ esac ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ # Report which library types will actually be built ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 ++$as_echo_n "checking if libtool supports shared libraries... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 ++$as_echo "$can_build_shared" >&6; } ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 ++$as_echo_n "checking whether to build shared libraries... " >&6; } ++ test "$can_build_shared" = "no" && enable_shared=no ++ ++ # On AIX, shared libraries and static libraries use the same namespace, and ++ # are all built from PIC. + case $host_os in + aix3*) +- cat <<\EOF >> "$cfgfile" +- +-# AIX sometimes has problems with the GCC collect2 program. For some +-# reason, if we set the COLLECT_NAMES environment variable, the problems +-# vanish in a puff of smoke. +-if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +-fi +-EOF +- ;; +- esac +- +- # We use sed instead of cat because bash on DJGPP gets confused if +- # if finds mixed CR/LF and LF-only lines. Since sed operates in +- # text mode, it properly converts lines to CR/LF. This bash problem +- # is reportedly fixed, but why not run on old versions too? +- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || \ +- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") +- chmod +x "$ofile" +- +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi +-fi +- +- ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++ ++ aix[4-9]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++ esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 ++$as_echo "$enable_shared" >&6; } ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 ++$as_echo_n "checking whether to build static libraries... " >&6; } ++ # Make sure either enable_shared or enable_static is yes. ++ test "$enable_shared" = yes || enable_static=yes ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 ++$as_echo "$enable_static" >&6; } ++ ++ ++ ++ ++fi + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -10529,79 +11800,2276 @@ + CC="$lt_save_CC" + + +-# Check whether --with-tags or --without-tags was given. +-if test "${with_tags+set}" = set; then +- withval="$with_tags" +- tagnames="$withval" +-fi; +- +-if test -f "$ltmain" && test -n "$tagnames"; then +- if test ! -f "${ofile}"; then +- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 +-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} +- fi +- +- if test -z "$LTCC"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" +- if test -z "$LTCC"; then +- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 +-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} +- else +- { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 +-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} +- fi +- fi +- +- # Extract list of available tagged configurations in $ofile. +- # Note that this assumes the entire list is on one line. +- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` +- +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for tagname in $tagnames; do +- IFS="$lt_save_ifs" +- # Check whether tagname contains only valid characters +- case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in +- "") ;; +- *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 +-echo "$as_me: error: invalid tag name: $tagname" >&2;} +- { (exit 1); exit 1; }; } +- ;; +- esac +- +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null +- then +- { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 +-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- # Update the list of available tags. +- if test -n "$tagname"; then +- echo appending configuration tag \"$tagname\" to $ofile +- +- case $tagname in +- CXX) +- if test -n "$CXX" && test "X$CXX" != "Xno"; then +- ac_ext=cc ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ac_config_commands="$ac_config_commands libtool" ++ ++ ++ ++ ++# Only expand once: ++ ++ ++ ++if test x"$enable_static$enable_all_static" = xnoyes; then ++ as_fn_error "You cannot pass --enable-all-static without one of --enable-static or --disable-shared" "$LINENO" 5 ++fi ++ if test $enable_static = yes; then ++ CR_ENABLE_STATIC_TRUE= ++ CR_ENABLE_STATIC_FALSE='#' ++else ++ CR_ENABLE_STATIC_TRUE='#' ++ CR_ENABLE_STATIC_FALSE= ++fi ++ ++ if test $enable_shared = yes; then ++ CR_ENABLE_SHARED_TRUE= ++ CR_ENABLE_SHARED_FALSE='#' ++else ++ CR_ENABLE_SHARED_TRUE='#' ++ CR_ENABLE_SHARED_FALSE= ++fi ++ ++ ++# Check for rpmbuild ++ ++ for ac_prog in rpmbuild rpmb rpm ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_RPMBUILD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $RPMBUILD in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_RPMBUILD="$RPMBUILD" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++as_dummy="$PATH:/usr/lib/rpm" ++for as_dir in $as_dummy ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++RPMBUILD=$ac_cv_path_RPMBUILD ++if test -n "$RPMBUILD"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RPMBUILD" >&5 ++$as_echo "$RPMBUILD" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$RPMBUILD" && break ++done ++test -n "$RPMBUILD" || RPMBUILD="none" ++ ++ if $RPMBUILD -bs 2>&1 | grep 'no spec' >/dev/null 2>/dev/null; then ++ : ++ else ++ RPMBUILD=none ++ fi ++ ++ if test $RPMBUILD != none; then ++ HAVE_RPMBUILD_TRUE= ++ HAVE_RPMBUILD_FALSE='#' ++else ++ HAVE_RPMBUILD_TRUE='#' ++ HAVE_RPMBUILD_FALSE= ++fi ++ ++ ++# Check for a GNU C compiler (or a work alike?) ++ ++ ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CC="${ac_tool_prefix}gcc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "gcc", so it can be a program name with args. ++set dummy gcc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CC="gcc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++else ++ CC="$ac_cv_prog_CC" ++fi ++ ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CC="${ac_tool_prefix}cc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ fi ++fi ++if test -z "$CC"; then ++ # Extract the first word of "cc", so it can be a program name with args. ++set dummy cc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++ ac_prog_rejected=no ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ++ ac_prog_rejected=yes ++ continue ++ fi ++ ac_cv_prog_CC="cc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++if test $ac_prog_rejected = yes; then ++ # We found a bogon in the path, so make sure we never use it. ++ set dummy $ac_cv_prog_CC ++ shift ++ if test $# != 0; then ++ # We chose a different compiler from the bogus one. ++ # However, it has the same basename, so the bogon will be chosen ++ # first if we set CC to just the basename; use the full file name. ++ shift ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ++ fi ++fi ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in cl.exe ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$CC" && break ++ done ++fi ++if test -z "$CC"; then ++ ac_ct_CC=$CC ++ for ac_prog in cl.exe ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CC="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CC" && break ++done ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++fi ++ ++fi ++ ++ ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "no acceptable C compiler found in \$PATH ++See \`config.log' for more details." "$LINENO" 5; } ++ ++# Provide some information about the compiler. ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_compiler_gnu=yes ++else ++ ac_compiler_gnu=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_c_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 ++$as_echo "$ac_cv_c_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GCC=yes ++else ++ GCC= ++fi ++ac_test_CFLAGS=${CFLAGS+set} ++ac_save_CFLAGS=$CFLAGS ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 ++$as_echo_n "checking whether $CC accepts -g... " >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_g=yes ++else ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_g=yes ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 ++$as_echo "$ac_cv_prog_cc_g" >&6; } ++if test "$ac_test_CFLAGS" = set; then ++ CFLAGS=$ac_save_CFLAGS ++elif test $ac_cv_prog_cc_g = yes; then ++ if test "$GCC" = yes; then ++ CFLAGS="-g -O2" ++ else ++ CFLAGS="-g" ++ fi ++else ++ if test "$GCC" = yes; then ++ CFLAGS="-O2" ++ else ++ CFLAGS= ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 ++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_cv_prog_cc_c89=no ++ac_save_CC=$CC ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++#include ++#include ++#include ++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ ++struct buf { int x; }; ++FILE * (*rcsopen) (struct buf *, struct stat *, int); ++static char *e (p, i) ++ char **p; ++ int i; ++{ ++ return p[i]; ++} ++static char *f (char * (*g) (char **, int), char **p, ...) ++{ ++ char *s; ++ va_list v; ++ va_start (v,p); ++ s = g (p, va_arg (v,int)); ++ va_end (v); ++ return s; ++} ++ ++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has ++ function prototypes and stuff, but not '\xHH' hex character constants. ++ These don't provoke an error unfortunately, instead are silently treated ++ as 'x'. The following induces an error, until -std is added to get ++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an ++ array size at least. It's necessary to write '\x00'==0 to get something ++ that's true only with -std. */ ++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; ++ ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ++ ++int test (int i, double x); ++struct s1 {int (*f) (int a);}; ++struct s2 {int (*f) (double a);}; ++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); ++int argc; ++char **argv; ++int ++main () ++{ ++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ++ ; ++ return 0; ++} ++_ACEOF ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++do ++ CC="$ac_save_CC $ac_arg" ++ if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_c89=$ac_arg ++fi ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break ++done ++rm -f conftest.$ac_ext ++CC=$ac_save_CC ++ ++fi ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 ++$as_echo "none needed" >&6; } ;; ++ xno) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 ++$as_echo "unsupported" >&6; } ;; ++ *) ++ CC="$CC $ac_cv_prog_cc_c89" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; ++esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : ++ ++fi ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++depcc="$CC" am_compiler_list= ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CC_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" ++ case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; ++ none) break ;; ++ esac ++ if depmode=$depmode \ ++ source=sub/conftest.c object=$am__obj \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CC_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CC_dependencies_compiler_type=none ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } ++CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then ++ am__fastdepCC_TRUE= ++ am__fastdepCC_FALSE='#' ++else ++ am__fastdepCC_TRUE='#' ++ am__fastdepCC_FALSE= ++fi ++ ++ ++ ++ if test "$GCC" = yes; then ++ : ++ else ++ cat >confcache <<\_ACEOF ++# This file is a shell script that caches the results of configure ++# tests run on this system so they can be shared between configure ++# scripts and configure runs, see configure's option --config-cache. ++# It is not useful on other systems. If it contains results you don't ++# want to keep, you may remove or edit it. ++# ++# config.status only pays attention to the cache file if you give it ++# the --recheck option to rerun configure. ++# ++# `ac_cv_env_foo' variables (set or unset) will be overridden when ++# loading this file, other *unset* `ac_cv_foo' will be assigned the ++# following values. ++ ++_ACEOF ++ ++# The following way of writing the cache mishandles newlines in values, ++# but we know of no workaround that is simple, portable, and efficient. ++# So, we kill variables containing newlines. ++# Ultrix sh set writes to stderr and can't be redirected directly, ++# and sets the high bit in the cache file unless we assign to the vars. ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ ++ (set) 2>&1 | ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. ++ sed -n \ ++ "s/'/'\\\\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ++ ;; #( ++ *) ++ # `set' quotes correctly as required by POSIX, so do not add quotes. ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | ++ sed ' ++ /^ac_cv_env_/b end ++ t clear ++ :clear ++ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ ++ t end ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} ++ cat confcache >$cache_file ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} ++ fi ++fi ++rm -f confcache ++ as_fn_error "the C compiler '$CC' is not a GNU C compiler." "$LINENO" 5 ++ fi ++ ++ ++ ++# Configure inlining (XXX: need to probe gcc for support?) ++ ++$as_echo "#define CR_INLINE static __inline__ __attribute__ ((__unused__))" >>confdefs.h ++ ++ ++# Check for additional flags needed when building libcr ++if test x"$cr_build_libcr" = xyes; then ++CR_LIBCR_CFLAGS="" ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wall" >&5 ++$as_echo_n "checking whether gcc accepts -Wall... " >&6; } ++if test "${cr_cv_gcc_flag_WALL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ SAVE_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS -Wall" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ cr_cv_gcc_flag_WALL=yes ++else ++ cr_cv_gcc_flag_WALL=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ CFLAGS=$SAVE_CFLAGS ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_gcc_flag_WALL" >&5 ++$as_echo "$cr_cv_gcc_flag_WALL" >&6; } ++ ++ if eval test $cr_cv_gcc_flag_WALL = yes; then ++ CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wall" ++ else ++ : ++ fi ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc accepts -Wno-unused-function" >&5 ++$as_echo_n "checking whether gcc accepts -Wno-unused-function... " >&6; } ++if test "${cr_cv_gcc_flag_WNO_UNUSED_FUNCTION+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ SAVE_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS -Wno-unused-function" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=yes ++else ++ cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ CFLAGS=$SAVE_CFLAGS ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&5 ++$as_echo "$cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&6; } ++ ++ if eval test $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION = yes; then ++ CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wno-unused-function" ++ else ++ : ++ fi ++ ++ ++ ++fi # cr_build_libcr ++ ++# Additional flags needed when linking utils, tests and examples ++CR_CLIENT_LDADD="" ++if test x"$enable_all_static" = xyes; then ++ CR_CLIENT_LDADD="$CR_CLIENT_LDADD -all-static" ++fi ++ ++ ++# If building the tests, we can optionally test C++ ++# Note, however, that bug 2619 reports that we can't call this conditionally. ++ ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- +- ++if test -z "$CXX"; then ++ if test -n "$CCC"; then ++ CXX=$CCC ++ else ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CXX"; then ++ ac_cv_prog_CXX="$CXX" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CXX=$ac_cv_prog_CXX ++if test -n "$CXX"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 ++$as_echo "$CXX" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$CXX" && break ++ done ++fi ++if test -z "$CXX"; then ++ ac_ct_CXX=$CXX ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CXX"; then ++ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CXX="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX ++if test -n "$ac_ct_CXX"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 ++$as_echo "$ac_ct_CXX" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CXX" && break ++done ++ ++ if test "x$ac_ct_CXX" = x; then ++ CXX="g++" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CXX=$ac_ct_CXX ++ fi ++fi ++ ++ fi ++fi ++# Provide some information about the compiler. ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } ++if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_compiler_gnu=yes ++else ++ ac_compiler_gnu=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 ++$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GXX=yes ++else ++ GXX= ++fi ++ac_test_CXXFLAGS=${CXXFLAGS+set} ++ac_save_CXXFLAGS=$CXXFLAGS ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 ++$as_echo_n "checking whether $CXX accepts -g... " >&6; } ++if test "${ac_cv_prog_cxx_g+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_save_cxx_werror_flag=$ac_cxx_werror_flag ++ ac_cxx_werror_flag=yes ++ ac_cv_prog_cxx_g=no ++ CXXFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_cv_prog_cxx_g=yes ++else ++ CXXFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ++else ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++ CXXFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_cv_prog_cxx_g=yes ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 ++$as_echo "$ac_cv_prog_cxx_g" >&6; } ++if test "$ac_test_CXXFLAGS" = set; then ++ CXXFLAGS=$ac_save_CXXFLAGS ++elif test $ac_cv_prog_cxx_g = yes; then ++ if test "$GXX" = yes; then ++ CXXFLAGS="-g -O2" ++ else ++ CXXFLAGS="-g" ++ fi ++else ++ if test "$GXX" = yes; then ++ CXXFLAGS="-O2" ++ else ++ CXXFLAGS= ++ fi ++fi ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++depcc="$CXX" am_compiler_list= ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CXX_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" ++ case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; ++ none) break ;; ++ esac ++ if depmode=$depmode \ ++ source=sub/conftest.c object=$am__obj \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CXX_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CXX_dependencies_compiler_type=none ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } ++CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then ++ am__fastdepCXX_TRUE= ++ am__fastdepCXX_FALSE='#' ++else ++ am__fastdepCXX_TRUE='#' ++ am__fastdepCXX_FALSE= ++fi ++ ++ ++ ++ ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++if test -z "$CXX"; then ++ if test -n "$CCC"; then ++ CXX=$CCC ++ else ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CXX"; then ++ ac_cv_prog_CXX="$CXX" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CXX=$ac_cv_prog_CXX ++if test -n "$CXX"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 ++$as_echo "$CXX" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$CXX" && break ++ done ++fi ++if test -z "$CXX"; then ++ ac_ct_CXX=$CXX ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CXX"; then ++ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CXX="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX ++if test -n "$ac_ct_CXX"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 ++$as_echo "$ac_ct_CXX" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CXX" && break ++done ++ ++ if test "x$ac_ct_CXX" = x; then ++ CXX="g++" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CXX=$ac_ct_CXX ++ fi ++fi ++ ++ fi ++fi ++# Provide some information about the compiler. ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } ++if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_compiler_gnu=yes ++else ++ ac_compiler_gnu=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 ++$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GXX=yes ++else ++ GXX= ++fi ++ac_test_CXXFLAGS=${CXXFLAGS+set} ++ac_save_CXXFLAGS=$CXXFLAGS ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 ++$as_echo_n "checking whether $CXX accepts -g... " >&6; } ++if test "${ac_cv_prog_cxx_g+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_save_cxx_werror_flag=$ac_cxx_werror_flag ++ ac_cxx_werror_flag=yes ++ ac_cv_prog_cxx_g=no ++ CXXFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_cv_prog_cxx_g=yes ++else ++ CXXFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ++else ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++ CXXFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_cv_prog_cxx_g=yes ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 ++$as_echo "$ac_cv_prog_cxx_g" >&6; } ++if test "$ac_test_CXXFLAGS" = set; then ++ CXXFLAGS=$ac_save_CXXFLAGS ++elif test $ac_cv_prog_cxx_g = yes; then ++ if test "$GXX" = yes; then ++ CXXFLAGS="-g -O2" ++ else ++ CXXFLAGS="-g" ++ fi ++else ++ if test "$GXX" = yes; then ++ CXXFLAGS="-O2" ++ else ++ CXXFLAGS= ++ fi ++fi ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++depcc="$CXX" am_compiler_list= ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CXX_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" ++ case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; ++ none) break ;; ++ esac ++ if depmode=$depmode \ ++ source=sub/conftest.c object=$am__obj \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CXX_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CXX_dependencies_compiler_type=none ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } ++CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then ++ am__fastdepCXX_TRUE= ++ am__fastdepCXX_FALSE='#' ++else ++ am__fastdepCXX_TRUE='#' ++ am__fastdepCXX_FALSE= ++fi ++ ++ ++if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 ++$as_echo_n "checking how to run the C++ preprocessor... " >&6; } ++if test -z "$CXXCPP"; then ++ if test "${ac_cv_prog_CXXCPP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ # Double quotes because CXXCPP needs to be expanded ++ for CXXCPP in "$CXX -E" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_cxx_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer to if __STDC__ is defined, since ++ # exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ Syntax error ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ # Broken: success on invalid input. ++continue ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ break ++fi ++ ++ done ++ ac_cv_prog_CXXCPP=$CXXCPP ++ ++fi ++ CXXCPP=$ac_cv_prog_CXXCPP ++else ++ ac_cv_prog_CXXCPP=$CXXCPP ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 ++$as_echo "$CXXCPP" >&6; } ++ac_preproc_ok=false ++for ac_cxx_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer to if __STDC__ is defined, since ++ # exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ Syntax error ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ # Broken: success on invalid input. ++continue ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ ++else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++_lt_caught_CXX_error=yes; } ++fi ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++else ++ _lt_caught_CXX_error=yes ++fi ++ ++ ++ ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++if test -z "$CXX"; then ++ if test -n "$CCC"; then ++ CXX=$CCC ++ else ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CXX"; then ++ ac_cv_prog_CXX="$CXX" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CXX=$ac_cv_prog_CXX ++if test -n "$CXX"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 ++$as_echo "$CXX" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$CXX" && break ++ done ++fi ++if test -z "$CXX"; then ++ ac_ct_CXX=$CXX ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CXX"; then ++ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CXX="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX ++if test -n "$ac_ct_CXX"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 ++$as_echo "$ac_ct_CXX" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CXX" && break ++done ++ ++ if test "x$ac_ct_CXX" = x; then ++ CXX="g++" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CXX=$ac_ct_CXX ++ fi ++fi ++ ++ fi ++fi ++# Provide some information about the compiler. ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } ++if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_compiler_gnu=yes ++else ++ ac_compiler_gnu=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 ++$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GXX=yes ++else ++ GXX= ++fi ++ac_test_CXXFLAGS=${CXXFLAGS+set} ++ac_save_CXXFLAGS=$CXXFLAGS ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 ++$as_echo_n "checking whether $CXX accepts -g... " >&6; } ++if test "${ac_cv_prog_cxx_g+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_save_cxx_werror_flag=$ac_cxx_werror_flag ++ ac_cxx_werror_flag=yes ++ ac_cv_prog_cxx_g=no ++ CXXFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_cv_prog_cxx_g=yes ++else ++ CXXFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ++else ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++ CXXFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_cv_prog_cxx_g=yes ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 ++$as_echo "$ac_cv_prog_cxx_g" >&6; } ++if test "$ac_test_CXXFLAGS" = set; then ++ CXXFLAGS=$ac_save_CXXFLAGS ++elif test $ac_cv_prog_cxx_g = yes; then ++ if test "$GXX" = yes; then ++ CXXFLAGS="-g -O2" ++ else ++ CXXFLAGS="-g" ++ fi ++else ++ if test "$GXX" = yes; then ++ CXXFLAGS="-O2" ++ else ++ CXXFLAGS= ++ fi ++fi ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++depcc="$CXX" am_compiler_list= ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CXX_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" ++ case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; ++ none) break ;; ++ esac ++ if depmode=$depmode \ ++ source=sub/conftest.c object=$am__obj \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CXX_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CXX_dependencies_compiler_type=none ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } ++CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then ++ am__fastdepCXX_TRUE= ++ am__fastdepCXX_FALSE='#' ++else ++ am__fastdepCXX_TRUE='#' ++ am__fastdepCXX_FALSE= ++fi ++ ++ ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + archive_cmds_need_lc_CXX=no + allow_undefined_flag_CXX= + always_export_symbols_CXX=no + archive_expsym_cmds_CXX= ++compiler_needs_object_CXX=no + export_dynamic_flag_spec_CXX= + hardcode_direct_CXX=no ++hardcode_direct_absolute_CXX=no + hardcode_libdir_flag_spec_CXX= + hardcode_libdir_flag_spec_ld_CXX= + hardcode_libdir_separator_CXX= + hardcode_minus_L_CXX=no ++hardcode_shlibpath_var_CXX=unsupported + hardcode_automatic_CXX=no ++inherit_rpath_CXX=no + module_cmds_CXX= + module_expsym_cmds_CXX= + link_all_deplibs_CXX=unknown +@@ -10610,82 +14078,113 @@ + whole_archive_flag_spec_CXX= + enable_shared_with_static_runtimes_CXX=no + +-# Dependencies to place before and after the object being linked: +-predep_objects_CXX= +-postdep_objects_CXX= +-predeps_CXX= +-postdeps_CXX= +-compiler_lib_search_path_CXX= +- + # Source file extension for C++ test sources. +-ac_ext=cc ++ac_ext=cpp + + # Object file extension for compiled C++ test sources. + objext=o + objext_CXX=$objext + +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;\n" +- +-# Code to be used in simple link tests +-lt_simple_link_test_code='int main(int, char *) { return(0); }\n' +- +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++# No sense in running all these tests if we already determined that ++# the CXX compiler isn't working. Some variables (like enable_shared) ++# are currently assumed to apply to all compilers on this platform, ++# and will be corrupted by setting them based on a non-working compiler. ++if test "$_lt_caught_CXX_error" != yes; then ++ # Code to be used in simple compile tests ++ lt_simple_compile_test_code="int some_variable = 0;" ++ ++ # Code to be used in simple link tests ++ lt_simple_link_test_code='int main(int, char *[]) { return(0); }' ++ ++ # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ ++ ++ ++ ++ + + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ + # Allow CC to be a program name with arguments. + compiler=$CC + + +-# Allow CC to be a program name with arguments. +-lt_save_CC=$CC +-lt_save_LD=$LD +-lt_save_GCC=$GCC +-GCC=$GXX +-lt_save_with_gnu_ld=$with_gnu_ld +-lt_save_path_LD=$lt_cv_path_LD +-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then +- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +-else +- unset lt_cv_prog_gnu_ld +-fi +-if test -n "${lt_cv_path_LDCXX+set}"; then +- lt_cv_path_LD=$lt_cv_path_LDCXX +-else +- unset lt_cv_path_LD +-fi +-test -z "${LDCXX+set}" || LD=$LDCXX +-CC=${CXX-"c++"} +-compiler=$CC +-compiler_CXX=$CC +-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +- +-# We don't want -fno-exception wen compiling C++ code, so set the +-# no_builtin_flag separately +-if test "$GXX" = yes; then +- lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' +-else +- lt_prog_compiler_no_builtin_flag_CXX= +-fi +- +-if test "$GXX" = yes; then +- # Set up default GNU C++ configuration +- +- +-# Check whether --with-gnu-ld or --without-gnu-ld was given. +-if test "${with_gnu_ld+set}" = set; then +- withval="$with_gnu_ld" +- test "$withval" = no || with_gnu_ld=yes ++ # save warnings/boilerplate of simple test code ++ ac_outfile=conftest.$ac_objext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$RM conftest* ++ ++ ac_outfile=conftest.$ac_objext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$RM -r conftest* ++ ++ ++ # Allow CC to be a program name with arguments. ++ lt_save_CC=$CC ++ lt_save_LD=$LD ++ lt_save_GCC=$GCC ++ GCC=$GXX ++ lt_save_with_gnu_ld=$with_gnu_ld ++ lt_save_path_LD=$lt_cv_path_LD ++ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++ else ++ $as_unset lt_cv_prog_gnu_ld ++ fi ++ if test -n "${lt_cv_path_LDCXX+set}"; then ++ lt_cv_path_LD=$lt_cv_path_LDCXX ++ else ++ $as_unset lt_cv_path_LD ++ fi ++ test -z "${LDCXX+set}" || LD=$LDCXX ++ CC=${CXX-"c++"} ++ compiler=$CC ++ compiler_CXX=$CC ++ for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++ ++ ++ if test -n "$compiler"; then ++ # We don't want -fno-exception when compiling C++ code, so set the ++ # no_builtin_flag separately ++ if test "$GXX" = yes; then ++ lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' ++ else ++ lt_prog_compiler_no_builtin_flag_CXX= ++ fi ++ ++ if test "$GXX" = yes; then ++ # Set up default GNU C++ configuration ++ ++ ++ ++# Check whether --with-gnu-ld was given. ++if test "${with_gnu_ld+set}" = set; then : ++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + else + with_gnu_ld=no +-fi; ++fi ++ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 ++$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -10698,9 +14197,9 @@ + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld +- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` ++ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; +@@ -10714,14 +14213,14 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- echo "$as_me:$LINENO: checking for GNU ld" >&5 +-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 +-else +- echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 +-fi +-if test "${lt_cv_path_LD+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 ++$as_echo_n "checking for GNU ld... " >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 ++$as_echo_n "checking for non-GNU ld... " >&6; } ++fi ++if test "${lt_cv_path_LD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +@@ -10731,7 +14230,7 @@ + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some GNU ld's only accept -v. ++ # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +-echo "${ECHO_T}$LD" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } +-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +-if test "${lt_cv_prog_gnu_ld+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- # I'd rather use --version here, but apparently some GNU ld's only accept -v. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 ++$as_echo "$LD" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++test -z "$LD" && CXX=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 ++$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } ++if test "${lt_cv_prog_gnu_ld+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 &5 +-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 ++$as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + + +- # Check if GNU C++ uses GNU ld as the underlying linker, since the +- # archiving commands below assume that GNU ld is being used. +- if test "$with_gnu_ld" = yes; then +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- +- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' +- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +- +- # If archive_cmds runs LD, not CC, wlarc should be empty +- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to +- # investigate it a little bit more. (MM) +- wlarc='${wl}' +- +- # ancient GNU ld didn't support --whole-archive et. al. +- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ +- grep 'no-whole-archive' > /dev/null; then +- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- whole_archive_flag_spec_CXX= +- fi +- else +- with_gnu_ld=no +- wlarc= +- +- # A generic and very simple default shared library creation +- # command for GNU C++ for the case where it uses the native +- # linker, instead of GNU ld. If possible, this setting should +- # overridden to take advantage of the native linker features on +- # the platform it is being used on. +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- fi +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +-else +- GXX=no +- with_gnu_ld=no +- wlarc= +-fi +- +-# PORTME: fill in a description of your system's C++ link characteristics +-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +-ld_shlibs_CXX=yes +-case $host_os in +- aix3*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- aix4* | aix5*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- aix_use_runtimelinking=no +- +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) +- for ld_flag in $LDFLAGS; do +- case $ld_flag in +- *-brtl*) +- aix_use_runtimelinking=yes +- break +- ;; +- esac +- done +- esac +- +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi +- +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +- +- archive_cmds_CXX='' +- hardcode_direct_CXX=yes +- hardcode_libdir_separator_CXX=':' +- link_all_deplibs_CXX=yes +- +- if test "$GXX" = yes; then +- case $host_os in aix4.012|aix4.012.*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- hardcode_direct_CXX=yes +- else +- # We have old collect2 +- hardcode_direct_CXX=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- hardcode_minus_L_CXX=yes +- hardcode_libdir_flag_spec_CXX='-L$libdir' +- hardcode_libdir_separator_CXX= +- fi +- esac +- shared_flag='-shared' +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' ++ ++ ++ ++ ++ # Check if GNU C++ uses GNU ld as the underlying linker, since the ++ # archiving commands below assume that GNU ld is being used. ++ if test "$with_gnu_ld" = yes; then ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' ++ ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++ # investigate it a little bit more. (MM) ++ wlarc='${wl}' ++ ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if eval "`$CC -print-prog-name=ld` --help 2>&1" | ++ $GREP 'no-whole-archive' > /dev/null; then ++ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ whole_archive_flag_spec_CXX= ++ fi + else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi +- +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- always_export_symbols_CXX=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- allow_undefined_flag_CXX='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +- +- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" +- +- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' +- allow_undefined_flag_CXX="-z nodefs" +- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +- +- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- no_undefined_flag_CXX=' ${wl}-bernotok' +- allow_undefined_flag_CXX=' ${wl}-berok' +- # -bexpall does not export symbols beginning with underscore (_) +- always_export_symbols_CXX=yes +- # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec_CXX=' ' +- archive_cmds_need_lc_CXX=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; +- chorus*) +- case $cc_basename in +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; +- +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, +- # as there is no search path for DLLs. +- hardcode_libdir_flag_spec_CXX='-L$libdir' +- allow_undefined_flag_CXX=unsupported +- always_export_symbols_CXX=no +- enable_shared_with_static_runtimes_CXX=yes +- +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' +- else +- ld_shlibs_CXX=no +- fi +- ;; +- +- darwin* | rhapsody*) +- if test "$GXX" = yes; then +- archive_cmds_need_lc_CXX=no +- case "$host_os" in +- rhapsody* | darwin1.[012]) +- allow_undefined_flag_CXX='-undefined suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- allow_undefined_flag_CXX='-flat_namespace -undefined suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- allow_undefined_flag_CXX='-flat_namespace -undefined suppress' +- ;; +- 10.*) +- allow_undefined_flag_CXX='-undefined dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- lt_int_apple_cc_single_mod=no +- output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes +- fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- hardcode_direct_CXX=no +- hardcode_automatic_CXX=yes +- hardcode_shlibpath_var_CXX=unsupported +- whole_archive_flag_spec_CXX='-all_load $convenience' +- link_all_deplibs_CXX=yes +- else +- ld_shlibs_CXX=no +- fi +- ;; +- +- dgux*) +- case $cc_basename in +- ec++) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- ghcx) +- # Green Hills C++ Compiler +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; +- freebsd12*) +- # C++ shared libraries reported to be fairly broken before switch to ELF +- ld_shlibs_CXX=no +- ;; +- freebsd-elf*) +- archive_cmds_need_lc_CXX=no +- ;; +- freebsd* | kfreebsd*-gnu) +- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF +- # conventions +- ld_shlibs_CXX=yes +- ;; +- gnu*) +- ;; +- hpux9*) +- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_CXX=: +- export_dynamic_flag_spec_CXX='${wl}-E' +- hardcode_direct_CXX=yes +- hardcode_minus_L_CXX=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- +- case $cc_basename in +- CC) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- aCC) +- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ with_gnu_ld=no ++ wlarc= ++ ++ # A generic and very simple default shared library creation ++ # command for GNU C++ for the case where it uses the native ++ # linker, instead of GNU ld. If possible, this setting should ++ # overridden to take advantage of the native linker features on ++ # the platform it is being used on. ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ fi ++ + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ ++ else ++ GXX=no ++ with_gnu_ld=no ++ wlarc= ++ fi ++ ++ # PORTME: fill in a description of your system's C++ link characteristics ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++ ld_shlibs_CXX=yes ++ case $host_os in ++ aix3*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no +- fi +- ;; +- esac +- ;; +- hpux10*|hpux11*) +- if test $with_gnu_ld = no; then +- case "$host_cpu" in +- hppa*64*) +- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' +- hardcode_libdir_flag_spec_ld_CXX='+b $libdir' +- hardcode_libdir_separator_CXX=: + ;; +- ia64*) +- hardcode_libdir_flag_spec_CXX='-L$libdir' ++ aix[4-9]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) ++ for ld_flag in $LDFLAGS; do ++ case $ld_flag in ++ *-brtl*) ++ aix_use_runtimelinking=yes ++ break ++ ;; ++ esac ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ archive_cmds_CXX='' ++ hardcode_direct_CXX=yes ++ hardcode_direct_absolute_CXX=yes ++ hardcode_libdir_separator_CXX=':' ++ link_all_deplibs_CXX=yes ++ file_list_spec_CXX='${wl}-f,' ++ ++ if test "$GXX" = yes; then ++ case $host_os in aix4.[012]|aix4.[012].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && ++ strings "$collect2name" | $GREP resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ hardcode_direct_CXX=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ hardcode_minus_L_CXX=yes ++ hardcode_libdir_flag_spec_CXX='-L$libdir' ++ hardcode_libdir_separator_CXX= ++ fi ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi ++ ++ export_dynamic_flag_spec_CXX='${wl}-bexpall' ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to ++ # export. ++ always_export_symbols_CXX=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ allow_undefined_flag_CXX='-berok' ++ # Determine the default libpath from the value encoded in an empty ++ # executable. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_link "$LINENO"; then : ++ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" ++ ++ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' ++ allow_undefined_flag_CXX="-z nodefs" ++ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_link "$LINENO"; then : ++ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ no_undefined_flag_CXX=' ${wl}-bernotok' ++ allow_undefined_flag_CXX=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ whole_archive_flag_spec_CXX='$convenience' ++ archive_cmds_need_lc_CXX=yes ++ # This is similar to how AIX traditionally builds its shared ++ # libraries. ++ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi + ;; +- *) +- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_CXX=: +- export_dynamic_flag_spec_CXX='${wl}-E' +- ;; +- esac +- fi +- case "$host_cpu" in +- hppa*64*) +- hardcode_direct_CXX=no +- hardcode_shlibpath_var_CXX=no +- ;; +- ia64*) +- hardcode_direct_CXX=no +- hardcode_shlibpath_var_CXX=no +- hardcode_minus_L_CXX=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- ;; +- *) +- hardcode_direct_CXX=yes +- hardcode_minus_L_CXX=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- ;; +- esac +- +- case $cc_basename in +- CC) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- aCC) +- case "$host_cpu" in +- hppa*64*|ia64*) +- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' +- ;; +- *) +- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- if test $with_gnu_ld = no; then +- case "$host_cpu" in +- ia64*|hppa*64*) +- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' +- ;; +- *) +- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- fi ++ ++ beos*) ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ allow_undefined_flag_CXX=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ ++ chorus*) ++ case $cc_basename in ++ *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no +- fi +- ;; +- esac +- ;; +- irix5* | irix6*) +- case $cc_basename in +- CC) +- # SGI C++ +- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' +- +- # Archives containing C++ object files must be created using +- # "CC -ar", where "CC" is the IRIX C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' +- ;; +- *) +- if test "$GXX" = yes; then +- if test "$with_gnu_ld" = no; then +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' +- else +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' +- fi +- fi +- link_all_deplibs_CXX=yes +- ;; +- esac +- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_CXX=: +- ;; +- linux*) +- case $cc_basename in +- KCC) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- +- hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' +- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +- +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' +- ;; +- icpc) +- # Intel C++ +- with_gnu_ld=yes +- archive_cmds_need_lc_CXX=no +- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +- ;; +- cxx) +- # Compaq C++ +- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' +- +- runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec_CXX='-rpath $libdir' +- hardcode_libdir_separator_CXX=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- esac +- ;; +- lynxos*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- m88k*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- mvs*) +- case $cc_basename in +- cxx) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' +- wlarc= +- hardcode_libdir_flag_spec_CXX='-R$libdir' +- hardcode_direct_CXX=yes +- hardcode_shlibpath_var_CXX=no +- fi +- # Workaround some broken pre-1.5 toolchains +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' +- ;; +- osf3*) +- case $cc_basename in +- KCC) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- +- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +- hardcode_libdir_separator_CXX=: +- +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' +- +- ;; +- RCC) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- cxx) +- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' +- +- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_CXX=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' +- +- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ ;; ++ esac ++ ;; ++ ++ cygwin* | mingw* | pw32* | cegcc*) ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, ++ # as there is no search path for DLLs. ++ hardcode_libdir_flag_spec_CXX='-L$libdir' ++ allow_undefined_flag_CXX=unsupported ++ always_export_symbols_CXX=no ++ enable_shared_with_static_runtimes_CXX=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ darwin* | rhapsody*) ++ ++ ++ archive_cmds_need_lc_CXX=no ++ hardcode_direct_CXX=no ++ hardcode_automatic_CXX=yes ++ hardcode_shlibpath_var_CXX=unsupported ++ whole_archive_flag_spec_CXX='' ++ link_all_deplibs_CXX=yes ++ allow_undefined_flag_CXX="$_lt_dar_allow_undefined" ++ case $cc_basename in ++ ifort*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test "$_lt_dar_can_shared" = "yes"; then ++ output_verbose_link_cmd=echo ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" ++ fi ++ ++ else ++ ld_shlibs_CXX=no ++ fi ++ ++ ;; ++ ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ freebsd[12]*) ++ # C++ shared libraries reported to be fairly broken before ++ # switch to ELF ++ ld_shlibs_CXX=no ++ ;; ++ ++ freebsd-elf*) ++ archive_cmds_need_lc_CXX=no ++ ;; ++ ++ freebsd* | dragonfly*) ++ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++ # conventions ++ ld_shlibs_CXX=yes ++ ;; ++ ++ gnu*) ++ ;; ++ ++ hpux9*) ++ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_CXX=: ++ export_dynamic_flag_spec_CXX='${wl}-E' ++ hardcode_direct_CXX=yes ++ hardcode_minus_L_CXX=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ aCC*) ++ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ hpux10*|hpux11*) ++ if test $with_gnu_ld = no; then ++ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +- else +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- fi +- ;; +- esac +- ;; +- osf4* | osf5*) +- case $cc_basename in +- KCC) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- +- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +- hardcode_libdir_separator_CXX=: +- +- # Archives containing C++ object files must be created using +- # the KAI C++ compiler. +- old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' +- ;; +- RCC) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- cxx) +- allow_undefined_flag_CXX=' -expect_unresolved \*' +- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' +- archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ +- echo "-hidden">> $lib.exp~ +- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ +- $rm $lib.exp' +- +- hardcode_libdir_flag_spec_CXX='-rpath $libdir' +- hardcode_libdir_separator_CXX=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' +- +- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_CXX=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +- else +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- fi +- ;; +- esac +- ;; +- psos*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- sco*) +- archive_cmds_need_lc_CXX=no +- case $cc_basename in +- CC) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; +- sunos4*) +- case $cc_basename in +- CC) +- # Sun C++ 4.x +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- lcc) +- # Lucid +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; +- solaris*) +- case $cc_basename in +- CC) +- # Sun C++ 4.2, 5.x and Centerline C++ +- no_undefined_flag_CXX=' -zdefs' +- archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- +- hardcode_libdir_flag_spec_CXX='-R$libdir' +- hardcode_shlibpath_var_CXX=no +- case $host_os in +- solaris2.0-5 | solaris2.0-5.*) ;; +- *) +- # The C++ compiler is used as linker so we must use $wl +- # flag to pass the commands to the underlying system +- # linker. +- # Supported since Solaris 2.6 (maybe 2.5.1?) +- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' +- ;; +- esac +- link_all_deplibs_CXX=yes +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- +- # Archives containing C++ object files must be created using +- # "CC -xar", where "CC" is the Sun C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' +- ;; +- gcx) +- # Green Hills C++ Compiler +- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- +- # The C++ compiler must be used to create the archive. +- old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' +- ;; +- *) +- # GNU C++ compiler with Solaris linker +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- no_undefined_flag_CXX=' ${wl}-z ${wl}defs' +- if $CC --version | grep -v '^2\.7' > /dev/null; then +- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- ++ case $host_cpu in ++ hppa*64*|ia64*) ++ ;; ++ *) ++ export_dynamic_flag_spec_CXX='${wl}-E' ++ ;; ++ esac ++ fi ++ case $host_cpu in ++ hppa*64*|ia64*) ++ hardcode_direct_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ ;; ++ *) ++ hardcode_direct_CXX=yes ++ hardcode_direct_absolute_CXX=yes ++ hardcode_minus_L_CXX=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ;; ++ esac ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ aCC*) ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- else +- # g++ 2.7 appears to require `-G' NOT `-shared' on this +- # platform. +- archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test $with_gnu_ld = no; then ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ fi ++ else ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ interix[3-9]*) ++ hardcode_direct_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_CXX='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ irix5* | irix6*) ++ case $cc_basename in ++ CC*) ++ # SGI C++ ++ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test "$with_gnu_ld" = no; then ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' ++ fi ++ fi ++ link_all_deplibs_CXX=yes ++ ;; ++ esac ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_CXX=: ++ inherit_rpath_CXX=yes ++ ;; ++ ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ++ ;; ++ icpc* | ecpc* ) ++ # Intel C++ ++ with_gnu_ld=yes ++ # version 8.0 and above of icpc choke on multiply defined symbols ++ # if we add $predep_objects and $postdep_objects, however 7.1 and ++ # earlier do not add the objects themselves. ++ case `$CC -V 2>&1` in ++ *"Version 7."*) ++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 8.0 or newer ++ tmp_idyn= ++ case $host_cpu in ++ ia64*) tmp_idyn=' -i_dynamic';; ++ esac ++ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac ++ archive_cmds_need_lc_CXX=no ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' ++ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler ++ case `$CC -V` in ++ *pgCC\ [1-5]* | *pgcpp\ [1-5]*) ++ prelink_cmds_CXX='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ ++ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' ++ old_archive_cmds_CXX='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ ++ $RANLIB $oldlib' ++ archive_cmds_CXX='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ archive_expsym_cmds_CXX='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ;; ++ *) # Version 6 will use weak symbols ++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ;; ++ esac ++ ++ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' ++ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ ;; ++ cxx*) ++ # Compaq C++ ++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++ ++ runpath_var=LD_RUN_PATH ++ hardcode_libdir_flag_spec_CXX='-rpath $libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ xl*) ++ # IBM XL 8.0 on PPC, with GNU ld ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' ++ archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ if test "x$supports_anon_versioning" = xyes; then ++ archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ no_undefined_flag_CXX=' -zdefs' ++ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' ++ hardcode_libdir_flag_spec_CXX='-R$libdir' ++ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ compiler_needs_object_CXX=yes ++ ++ # Not sure whether something based on ++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 ++ # would be better. ++ output_verbose_link_cmd='echo' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ ++ lynxos*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ++ m88k*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' ++ wlarc= ++ hardcode_libdir_flag_spec_CXX='-R$libdir' ++ hardcode_direct_CXX=yes ++ hardcode_shlibpath_var_CXX=no ++ fi ++ # Workaround some broken pre-1.5 toolchains ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ ;; ++ ++ *nto* | *qnx*) ++ ld_shlibs_CXX=yes ++ ;; ++ ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ ld_shlibs_CXX=no ++ ;; ++ ++ openbsd*) ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct_CXX=yes ++ hardcode_shlibpath_var_CXX=no ++ hardcode_direct_absolute_CXX=yes ++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ export_dynamic_flag_spec_CXX='${wl}-E' ++ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi +- +- hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' ++ output_verbose_link_cmd=echo ++ else ++ ld_shlibs_CXX=no + fi + ;; +- esac +- ;; +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) +- archive_cmds_need_lc_CXX=no +- ;; +- tandem*) +- case $cc_basename in +- NCC) +- # NonStop-UX NCC 3.20 +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; ++ ++ osf3* | osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Archives containing C++ object files must be created using ++ # the KAI C++ compiler. ++ case $host in ++ osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; ++ *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; ++ esac ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ cxx*) ++ case $host in ++ osf3*) ++ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ ;; ++ *) ++ allow_undefined_flag_CXX=' -expect_unresolved \*' ++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++ echo "-hidden">> $lib.exp~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ ++ $RM $lib.exp' ++ hardcode_libdir_flag_spec_CXX='-rpath $libdir' ++ ;; ++ esac ++ ++ hardcode_libdir_separator_CXX=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' ++ case $host in ++ osf3*) ++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ;; ++ esac ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ ++ else ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ psos*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ lcc*) ++ # Lucid ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ archive_cmds_need_lc_CXX=yes ++ no_undefined_flag_CXX=' -zdefs' ++ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ hardcode_libdir_flag_spec_CXX='-R$libdir' ++ hardcode_shlibpath_var_CXX=no ++ case $host_os in ++ solaris2.[0-5] | solaris2.[0-5].*) ;; ++ *) ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' ++ ;; ++ esac ++ link_all_deplibs_CXX=yes ++ ++ output_verbose_link_cmd='echo' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ ++ # The C++ compiler must be used to create the archive. ++ old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++ ;; ++ *) ++ # GNU C++ compiler with Solaris linker ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ no_undefined_flag_CXX=' ${wl}-z ${wl}defs' ++ if $CC --version | $GREP -v '^2\.7' > /dev/null; then ++ archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ else ++ # g++ 2.7 appears to require `-G' NOT `-shared' on this ++ # platform. ++ archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ fi ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' ++ case $host_os in ++ solaris2.[0-5] | solaris2.[0-5].*) ;; ++ *) ++ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ ;; ++ ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) ++ no_undefined_flag_CXX='${wl}-z,text' ++ archive_cmds_need_lc_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ no_undefined_flag_CXX='${wl}-z,text' ++ allow_undefined_flag_CXX='${wl}-z,nodefs' ++ archive_cmds_need_lc_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' ++ hardcode_libdir_separator_CXX=':' ++ link_all_deplibs_CXX=yes ++ export_dynamic_flag_spec_CXX='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ vxworks*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ + *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; +- vxworks*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +-esac +-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +-echo "${ECHO_T}$ld_shlibs_CXX" >&6 +-test "$ld_shlibs_CXX" = no && can_build_shared=no +- +-GCC_CXX="$GXX" +-LD_CXX="$LD" +- +- +-cat > conftest.$ac_ext <&5 ++$as_echo "$ld_shlibs_CXX" >&6; } ++ test "$ld_shlibs_CXX" = no && can_build_shared=no ++ ++ GCC_CXX="$GXX" ++ LD_CXX="$LD" ++ ++ ## CAVEAT EMPTOR: ++ ## There is no encapsulation within the following macros, do not change ++ ## the running order or otherwise move them around unless you know exactly ++ ## what you are doing... ++ # Dependencies to place before and after the object being linked: ++predep_objects_CXX= ++postdep_objects_CXX= ++predeps_CXX= ++postdeps_CXX= ++compiler_lib_search_path_CXX= ++ ++cat > conftest.$ac_ext <<_LT_EOF + class Foo + { + public: +@@ -11670,13 +15266,13 @@ + private: + int a; + }; +-EOF +- +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++_LT_EOF ++ ++if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + +@@ -11684,19 +15280,14 @@ + # the conftest object file. + pre_test_object_deps_done=no + +- # The `*' in the case matches for architectures that use `case' in +- # $output_verbose_cmd can trigger glob expansion during the loop +- # eval without this substitution. +- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" +- +- for p in `eval $output_verbose_link_cmd`; do ++ for p in `eval "$output_verbose_link_cmd"`; do + case $p in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. +- if test $p = "-L" \ +- || test $p = "-R"; then ++ if test $p = "-L" || ++ test $p = "-R"; then + prev=$p + continue + else +@@ -11761,18 +15352,109 @@ + echo "libtool.m4: error: problem compiling CXX test program" + fi + +-$rm -f confest.$objext ++$RM -f confest.$objext ++ ++# PORTME: override above test on systems where it is broken ++case $host_os in ++interix[3-9]*) ++ # Interix 3.5 installs completely hosed .la files for C++, so rather than ++ # hack all around it, let's just trust "g++" to DTRT. ++ predep_objects_CXX= ++ postdep_objects_CXX= ++ postdeps_CXX= ++ ;; ++ ++linux*) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ ++ if test "$solaris_use_stlport4" != yes; then ++ postdeps_CXX='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++ ++solaris*) ++ case $cc_basename in ++ CC*) ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ ++ # Adding this requires a known-good setup of shared libraries for ++ # Sun compiler versions before 5.6, else PIC objects from an old ++ # archive will be linked into the output, leading to subtle bugs. ++ if test "$solaris_use_stlport4" != yes; then ++ postdeps_CXX='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++esac ++ + + case " $postdeps_CXX " in + *" -lc "*) archive_cmds_need_lc_CXX=no ;; + esac +- +-lt_prog_compiler_wl_CXX= ++ compiler_lib_search_dirs_CXX= ++if test -n "${compiler_lib_search_path_CXX}"; then ++ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ lt_prog_compiler_wl_CXX= + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX= + +-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -11787,18 +15469,30 @@ + lt_prog_compiler_static_CXX='-Bstatic' + fi + ;; ++ + amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' +- ;; +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac ++ ;; ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; +- mingw* | os2* | pw32*) ++ mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) +@@ -11810,29 +15504,39 @@ + # DJGPP does not support shared libraries at all + lt_prog_compiler_pic_CXX= + ;; ++ interix[3-9]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic_CXX=-Kconform_pic + fi + ;; + hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case "$host_cpu" in +- hppa*64*|ia64*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) + ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac + ;; ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic_CXX='-fPIC -shared' ++ ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac + else + case $host_os in +- aix4* | aix5*) ++ aix[4-9]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +@@ -11843,18 +15547,18 @@ + ;; + chorus*) + case $cc_basename in +- cxch68) ++ cxch68*) + # Green Hills C++ Compiler +- # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++ # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + dgux*) + case $cc_basename in +- ec++) ++ ec++*) + lt_prog_compiler_pic_CXX='-KPIC' + ;; +- ghcx) ++ ghcx*) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-pic' + ;; +@@ -11862,22 +15566,22 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in +- CC) ++ CC*) + lt_prog_compiler_wl_CXX='-Wl,' +- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" ++ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + lt_prog_compiler_pic_CXX='+Z' + fi + ;; +- aCC) ++ aCC*) + lt_prog_compiler_wl_CXX='-Wl,' +- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" +- case "$host_cpu" in ++ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' ++ case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; +@@ -11890,9 +15594,13 @@ + ;; + esac + ;; ++ interix*) ++ # This is c89, which is MS Visual C++ (no shared libs) ++ # Anyone wants to do a port? ++ ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in +- CC) ++ CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-non_shared' + # CC pic flag -KPIC is the default. +@@ -11901,27 +15609,54 @@ + ;; + esac + ;; +- linux*) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in +- KCC) ++ KCC*) + # KAI C++ Compiler + lt_prog_compiler_wl_CXX='--backend -Wl,' + lt_prog_compiler_pic_CXX='-fPIC' + ;; +- icpc) +- # Intel C++ ++ ecpc* ) ++ # old Intel C++ for x86_64 which still supported -KPIC. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-static' + ;; +- cxx) ++ icpc* ) ++ # Intel C++, used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-fPIC' ++ lt_prog_compiler_static_CXX='-static' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-fpic' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; ++ xlc* | xlC*) ++ # IBM XL 8.0 on PPC ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-qpic' ++ lt_prog_compiler_static_CXX='-qstaticlink' ++ ;; + *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ lt_prog_compiler_wl_CXX='-Qoption ld ' ++ ;; ++ esac + ;; + esac + ;; +@@ -11931,25 +15666,30 @@ + ;; + mvs*) + case $cc_basename in +- cxx) ++ cxx*) + lt_prog_compiler_pic_CXX='-W c,exportall' + ;; + *) + ;; + esac + ;; +- netbsd*) +- ;; ++ netbsd* | netbsdelf*-gnu) ++ ;; ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic_CXX='-fPIC -shared' ++ ;; + osf3* | osf4* | osf5*) + case $cc_basename in +- KCC) ++ KCC*) + lt_prog_compiler_wl_CXX='--backend -Wl,' + ;; +- RCC) ++ RCC*) + # Rational C++ 2.4.1 + lt_prog_compiler_pic_CXX='-pic' + ;; +- cxx) ++ cxx*) + # Digital/Compaq C++ + lt_prog_compiler_wl_CXX='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha +@@ -11963,24 +15703,15 @@ + ;; + psos*) + ;; +- sco*) +- case $cc_basename in +- CC) +- lt_prog_compiler_pic_CXX='-fPIC' +- ;; +- *) +- ;; +- esac +- ;; + solaris*) + case $cc_basename in +- CC) ++ CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; +- gcx) ++ gcx*) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-PIC' + ;; +@@ -11990,12 +15721,12 @@ + ;; + sunos4*) + case $cc_basename in +- CC) ++ CC*) + # Sun C++ 4.x + lt_prog_compiler_pic_CXX='-pic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; +- lcc) ++ lcc*) + # Lucid + lt_prog_compiler_pic_CXX='-pic' + ;; +@@ -12003,9 +15734,18 @@ + ;; + esac + ;; ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ esac ++ ;; + tandem*) + case $cc_basename in +- NCC) ++ NCC*) + # NonStop-UX NCC 3.20 + lt_prog_compiler_pic_CXX='-KPIC' + ;; +@@ -12013,8 +15753,6 @@ + ;; + esac + ;; +- unixware*) +- ;; + vxworks*) + ;; + *) +@@ -12023,22 +15761,32 @@ + esac + fi + +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ lt_prog_compiler_pic_CXX= ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ++ ;; ++esac ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 ++$as_echo "$lt_prog_compiler_pic_CXX" >&6; } ++ ++ + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_CXX"; then +- +-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 +-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_prog_compiler_pic_works_CXX=no +- ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 ++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } ++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic_works_CXX=no ++ ac_outfile=conftest.$ac_objext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. +@@ -12046,28 +15794,30 @@ + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12052: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15800: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12056: \$? = $ac_status" >&5 ++ echo "$as_me:15804: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test ! -s conftest.err; then +- lt_prog_compiler_pic_works_CXX=yes ++ # So say no if there are warnings other than the usual output. ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_pic_works_CXX=yes + fi + fi +- $rm conftest* +- +-fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 +- +-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } ++ ++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in + "" | " "*) ;; + *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; +@@ -12078,27 +15828,64 @@ + fi + + fi +-case "$host_os" in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- lt_prog_compiler_pic_CXX= +- ;; +- *) +- lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" +- ;; +-esac +- +-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ ++ ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } ++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_static_works_CXX=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&5 ++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_static_works_CXX=yes ++ fi ++ else ++ lt_cv_prog_compiler_static_works_CXX=yes ++ fi ++ fi ++ $RM -r conftest* ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } ++ ++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then ++ : ++else ++ lt_prog_compiler_static_CXX= ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 ++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o_CXX=no +- $rm -r conftest 2>/dev/null ++ $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or +@@ -12106,92 +15893,156 @@ + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12112: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15899: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12116: \$? = $ac_status" >&5 ++ echo "$as_me:15903: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +- if test ! -s out/conftest.err; then ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_CXX=yes + fi + fi +- chmod u+w . +- $rm conftest* ++ chmod u+w . 2>&5 ++ $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out + cd .. +- rmdir conftest +- $rm conftest* +- +-fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 ++ $RM -r conftest ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 ++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_c_o_CXX=no ++ $RM -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:15951: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&5 ++ echo "$as_me:15955: \$? = $ac_status" >&5 ++ if (exit $ac_status) && test -s out/conftest2.$ac_objext ++ then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_c_o_CXX=yes ++ fi ++ fi ++ chmod u+w . 2>&5 ++ $RM conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out ++ cd .. ++ $RM -r conftest ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } ++ ++ + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 ++$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes +- $rm conftest* ++ $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 ++$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi + else + need_locks=no + fi + +-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +- aix4* | aix5*) ++ aix[4-9]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' +- else +- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ else ++ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + export_symbols_cmds_CXX="$ltdll_cmds" + ;; +- cygwin* | mingw*) +- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ++ cygwin* | mingw* | cegcc*) ++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' ++ ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs_CXX=no + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +- +-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +-echo "${ECHO_T}$ld_shlibs_CXX" >&6 ++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 ++$as_echo "$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi ++with_gnu_ld_CXX=$with_gnu_ld ++ ++ ++ ++ ++ + + # + # Do we need to explicitly link libc? +@@ -12210,21 +16061,22 @@ + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 +- $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 ++$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } ++ $RM conftest* ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } 2>conftest.err; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX ++ pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= +@@ -12232,11 +16084,11 @@ + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 +- (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 ++ (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } + then + archive_cmds_need_lc_CXX=no + else +@@ -12246,21 +16098,85 @@ + else + cat conftest.err 1>&5 + fi +- $rm conftest* +- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 +- ;; +- esac +- fi +- ;; +-esac +- +-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 ++ $RM conftest* ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5 ++$as_echo "$archive_cmds_need_lc_CXX" >&6; } ++ ;; ++ esac ++ fi ++ ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 ++$as_echo_n "checking dynamic linker characteristics... " >&6; } ++ + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -12270,20 +16186,6 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -12301,7 +16203,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -12320,7 +16222,7 @@ + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no +@@ -12346,9 +16248,18 @@ + ;; + + amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ case $host_cpu in ++ powerpc) ++ # Since July 2007 AmigaOS4 officially supports .so libraries. ++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ ;; ++ m68k) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ esac + ;; + + beos*) +@@ -12357,7 +16268,7 @@ + shlibpath_var=LIBRARY_PATH + ;; + +-bsdi4*) ++bsdi[45]*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -12371,24 +16282,28 @@ + # libtool to hard-code these into programs + ;; + +-cygwin* | mingw* | pw32*) ++cygwin* | mingw* | pw32* | cegcc*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname' ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname~ ++ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++ fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ +- $rm \$dlpath' ++ $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in +@@ -12397,25 +16312,25 @@ + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; +- mingw*) ++ mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then ++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; +@@ -12434,17 +16349,12 @@ + version_type=darwin + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -12461,20 +16371,17 @@ + dynamic_linker=no + ;; + +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- +-freebsd*) +- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[123]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +@@ -12492,14 +16399,19 @@ + freebsd2*) + shlibpath_overrides_runpath=yes + ;; +- freebsd3.01* | freebsdelf3.01*) ++ freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +- *) # from 3.2 on ++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ ++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; + esac + ;; + +@@ -12519,9 +16431,9 @@ + version_type=sunos + need_lib_prefix=no + need_version=no +- case "$host_cpu" in ++ case $host_cpu in + ia64*) +- shrext='.so' ++ shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH +@@ -12535,19 +16447,19 @@ + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; +- hppa*64*) +- shrext='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext='.sl' ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +@@ -12559,6 +16471,18 @@ + postinstall_cmds='chmod 555 $lib' + ;; + ++interix[3-9]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ + irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; +@@ -12602,7 +16526,7 @@ + ;; + + # This must be Linux ELF. +-linux*) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -12611,6 +16535,32 @@ + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no ++ # Some binutils ld are patched to set DT_RUNPATH ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ ++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_link "$LINENO"; then : ++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : ++ shlibpath_overrides_runpath=yes ++fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir ++ + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. +@@ -12618,8 +16568,8 @@ + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -12631,7 +16581,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-knetbsd*-gnu) ++netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -12640,14 +16590,14 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' ++ dynamic_linker='NetBSD ld.elf_so' + ;; + + netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' +@@ -12668,24 +16618,31 @@ + shlibpath_overrides_runpath=yes + ;; + +-nto-qnx*) +- version_type=linux ++*nto* | *qnx*) ++ version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='ldqnx.so' + ;; + + openbsd*) + version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no +- need_version=yes ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no +@@ -12701,7 +16658,7 @@ + + os2*) + libname_spec='$name' +- shrext=".dll" ++ shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' +@@ -12719,11 +16676,8 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +-sco3.2v5*) +- version_type=osf +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH ++rdos*) ++ dynamic_linker=no + ;; + + solaris*) +@@ -12751,7 +16705,7 @@ + need_version=yes + ;; + +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' +@@ -12760,7 +16714,6 @@ + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) +@@ -12784,6 +16737,39 @@ + fi + ;; + ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ ++tpf*) ++ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ + uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -12795,23 +16781,70 @@ + dynamic_linker=no + ;; + esac +-echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 ++$as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + +-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi ++ ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++fi ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 ++$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action_CXX= +-if test -n "$hardcode_libdir_flag_spec_CXX" || \ +- test -n "$runpath_var CXX" || \ +- test "X$hardcode_automatic_CXX"="Xyes" ; then +- +- # We can hardcode non-existant directories. ++if test -n "$hardcode_libdir_flag_spec_CXX" || ++ test -n "$runpath_var_CXX" || ++ test "X$hardcode_automatic_CXX" = "Xyes" ; then ++ ++ # We can hardcode non-existent directories. + if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && ++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && + test "$hardcode_minus_L_CXX" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_CXX=relink +@@ -12824,10 +16857,11 @@ + # directories. + hardcode_action_CXX=unsupported + fi +-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +-echo "${ECHO_T}$hardcode_action_CXX" >&6 +- +-if test "$hardcode_action_CXX" = relink; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 ++$as_echo "$hardcode_action_CXX" >&6; } ++ ++if test "$hardcode_action_CXX" = relink || ++ test "$inherit_rpath_CXX" = yes; then + # Fast installation is not supported + enable_fast_install=no + elif test "$shlibpath_overrides_runpath" = yes || +@@ -12836,1240 +16870,24 @@ + enable_fast_install=needless + fi + +-striplib= +-old_striplib= +-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then +- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" +- test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +-else +-# FIXME - insert some real tests, host_os isn't really good enough +- case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- ;; +- *) +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +- ;; +- esac +-fi +- +-if test "x$enable_dlopen" != xyes; then +- enable_dlopen=unknown +- enable_dlopen_self=unknown +- enable_dlopen_self_static=unknown +-else +- lt_cv_dlopen=no +- lt_cv_dlopen_libs= +- +- case $host_os in +- beos*) +- lt_cv_dlopen="load_add_on" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ;; +- +- mingw* | pw32*) +- lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= +- ;; +- +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; +- +- darwin*) +- # if libdl is installed we need to link against it +- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-int +-main () +-{ +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dl_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dl_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +-if test $ac_cv_lib_dl_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- +- lt_cv_dlopen="dyld" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- +-fi +- +- ;; +- +- *) +- echo "$as_me:$LINENO: checking for shl_load" >&5 +-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 +-if test "${ac_cv_func_shl_load+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define shl_load to an innocuous variant, in case declares shl_load. +- For example, HP-UX 11i declares gettimeofday. */ +-#define shl_load innocuous_shl_load +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shl_load (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef shl_load +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char shl_load (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_shl_load) || defined (__stub___shl_load) +-choke me +-#else +-char (*f) () = shl_load; +-#endif +-#ifdef __cplusplus +-} +-#endif +- +-int +-main () +-{ +-return f != shl_load; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_shl_load=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_func_shl_load=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +-if test $ac_cv_func_shl_load = yes; then +- lt_cv_dlopen="shl_load" +-else +- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 +-if test "${ac_cv_lib_dld_shl_load+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char shl_load (); +-int +-main () +-{ +-shl_load (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dld_shl_load=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dld_shl_load=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +-if test $ac_cv_lib_dld_shl_load = yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" +-else +- echo "$as_me:$LINENO: checking for dlopen" >&5 +-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 +-if test "${ac_cv_func_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define dlopen to an innocuous variant, in case declares dlopen. +- For example, HP-UX 11i declares gettimeofday. */ +-#define dlopen innocuous_dlopen +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char dlopen (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef dlopen +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_dlopen) || defined (__stub___dlopen) +-choke me +-#else +-char (*f) () = dlopen; +-#endif +-#ifdef __cplusplus +-} +-#endif +- +-int +-main () +-{ +-return f != dlopen; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_func_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +-if test $ac_cv_func_dlopen = yes; then +- lt_cv_dlopen="dlopen" +-else +- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-int +-main () +-{ +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dl_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dl_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +-if test $ac_cv_lib_dl_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 +-if test "${ac_cv_lib_svld_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lsvld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-int +-main () +-{ +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_svld_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_svld_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +-if test $ac_cv_lib_svld_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +-else +- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 +-if test "${ac_cv_lib_dld_dld_link+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dld_link (); +-int +-main () +-{ +-dld_link (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dld_dld_link=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dld_dld_link=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +-if test $ac_cv_lib_dld_dld_link = yes; then +- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" +-fi +- +- +-fi +- +- +-fi +- +- +-fi +- +- +-fi +- +- +-fi +- +- ;; +- esac +- +- if test "x$lt_cv_dlopen" != xno; then +- enable_dlopen=yes +- else +- enable_dlopen=no +- fi +- +- case $lt_cv_dlopen in +- dlopen) +- save_CPPFLAGS="$CPPFLAGS" +- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" +- +- save_LDFLAGS="$LDFLAGS" +- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" +- +- save_LIBS="$LIBS" +- LIBS="$lt_cv_dlopen_libs $LIBS" +- +- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 +-if test "${lt_cv_dlopen_self+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test "$cross_compiling" = yes; then : +- lt_cv_dlopen_self=cross +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < +-#endif +- +-#include +- +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif +- +-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we +- find out it does not work in some platform. */ +-#ifndef LT_DLLAZY_OR_NOW +-# ifdef RTLD_LAZY +-# define LT_DLLAZY_OR_NOW RTLD_LAZY +-# else +-# ifdef DL_LAZY +-# define LT_DLLAZY_OR_NOW DL_LAZY +-# else +-# ifdef RTLD_NOW +-# define LT_DLLAZY_OR_NOW RTLD_NOW +-# else +-# ifdef DL_NOW +-# define LT_DLLAZY_OR_NOW DL_NOW +-# else +-# define LT_DLLAZY_OR_NOW 0 +-# endif +-# endif +-# endif +-# endif +-#endif +- +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; +- +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } +- +- exit (status); +-} +-EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; +- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; +- x$lt_unknown|x*) lt_cv_dlopen_self=no ;; +- esac +- else : +- # compilation failed +- lt_cv_dlopen_self=no +- fi +-fi +-rm -fr conftest* +- +- +-fi +-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +- +- if test "x$lt_cv_dlopen_self" = xyes; then +- LDFLAGS="$LDFLAGS $link_static_flag" +- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 +-if test "${lt_cv_dlopen_self_static+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test "$cross_compiling" = yes; then : +- lt_cv_dlopen_self_static=cross +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < +-#endif +- +-#include +- +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif +- +-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we +- find out it does not work in some platform. */ +-#ifndef LT_DLLAZY_OR_NOW +-# ifdef RTLD_LAZY +-# define LT_DLLAZY_OR_NOW RTLD_LAZY +-# else +-# ifdef DL_LAZY +-# define LT_DLLAZY_OR_NOW DL_LAZY +-# else +-# ifdef RTLD_NOW +-# define LT_DLLAZY_OR_NOW RTLD_NOW +-# else +-# ifdef DL_NOW +-# define LT_DLLAZY_OR_NOW DL_NOW +-# else +-# define LT_DLLAZY_OR_NOW 0 +-# endif +-# endif +-# endif +-# endif +-#endif +- +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; +- +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } +- +- exit (status); +-} +-EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; +- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; +- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; +- esac +- else : +- # compilation failed +- lt_cv_dlopen_self_static=no +- fi +-fi +-rm -fr conftest* +- +- +-fi +-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +- fi +- +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" +- ;; +- esac +- +- case $lt_cv_dlopen_self in +- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; +- *) enable_dlopen_self=unknown ;; +- esac +- +- case $lt_cv_dlopen_self_static in +- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; +- *) enable_dlopen_self_static=unknown ;; +- esac +-fi +- +- +-# The else clause should only fire when bootstrapping the +-# libtool distribution, otherwise you forgot to ship ltmain.sh +-# with your package, and you will get complaints that there are +-# no rules to generate ltmain.sh. +-if test -f "$ltmain"; then +- # See if we are running on zsh, and set the options which allow our commands through +- # without removal of \ escapes. +- if test -n "${ZSH_VERSION+set}" ; then +- setopt NO_GLOB_SUBST +- fi +- # Now quote all the things that may contain metacharacters while being +- # careful not to overquote the AC_SUBSTed values. We take copies of the +- # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \ +- SED SHELL STRIP \ +- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ +- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ +- deplibs_check_method reload_flag reload_cmds need_locks \ +- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ +- lt_cv_sys_global_symbol_to_c_name_address \ +- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ +- old_postinstall_cmds old_postuninstall_cmds \ +- compiler_CXX \ +- CC_CXX \ +- LD_CXX \ +- lt_prog_compiler_wl_CXX \ +- lt_prog_compiler_pic_CXX \ +- lt_prog_compiler_static_CXX \ +- lt_prog_compiler_no_builtin_flag_CXX \ +- export_dynamic_flag_spec_CXX \ +- thread_safe_flag_spec_CXX \ +- whole_archive_flag_spec_CXX \ +- enable_shared_with_static_runtimes_CXX \ +- old_archive_cmds_CXX \ +- old_archive_from_new_cmds_CXX \ +- predep_objects_CXX \ +- postdep_objects_CXX \ +- predeps_CXX \ +- postdeps_CXX \ +- compiler_lib_search_path_CXX \ +- archive_cmds_CXX \ +- archive_expsym_cmds_CXX \ +- postinstall_cmds_CXX \ +- postuninstall_cmds_CXX \ +- old_archive_from_expsyms_cmds_CXX \ +- allow_undefined_flag_CXX \ +- no_undefined_flag_CXX \ +- export_symbols_cmds_CXX \ +- hardcode_libdir_flag_spec_CXX \ +- hardcode_libdir_flag_spec_ld_CXX \ +- hardcode_libdir_separator_CXX \ +- hardcode_automatic_CXX \ +- module_cmds_CXX \ +- module_expsym_cmds_CXX \ +- lt_cv_prog_compiler_c_o_CXX \ +- exclude_expsyms_CXX \ +- include_expsyms_CXX; do +- +- case $var in +- old_archive_cmds_CXX | \ +- old_archive_from_new_cmds_CXX | \ +- archive_cmds_CXX | \ +- archive_expsym_cmds_CXX | \ +- module_cmds_CXX | \ +- module_expsym_cmds_CXX | \ +- old_archive_from_expsyms_cmds_CXX | \ +- export_symbols_cmds_CXX | \ +- extract_expsyms_cmds | reload_cmds | finish_cmds | \ +- postinstall_cmds | postuninstall_cmds | \ +- old_postinstall_cmds | old_postuninstall_cmds | \ +- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) +- # Double-quote double-evaled strings. +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" +- ;; +- *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" +- ;; +- esac +- done +- +- case $lt_echo in +- *'\$0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` +- ;; +- esac +- +-cfgfile="$ofile" +- +- cat <<__EOF__ >> "$cfgfile" +-# ### BEGIN LIBTOOL TAG CONFIG: $tagname +- +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +- +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL +- +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared +- +-# Whether or not to build static libraries. +-build_old_libs=$enable_static +- +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc_CXX +- +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX +- +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install +- +-# The host system. +-host_alias=$host_alias +-host=$host +- +-# An echo program that does not interpret backslashes. +-echo=$lt_echo +- +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS +- +-# A C compiler. +-LTCC=$lt_LTCC +- +-# A language-specific compiler. +-CC=$lt_compiler_CXX +- +-# Is the compiler the GNU C compiler? +-with_gcc=$GCC_CXX +- +-# An ERE matcher. +-EGREP=$lt_EGREP +- +-# The linker used to build libraries. +-LD=$lt_LD_CXX +- +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S +- +-# A BSD-compatible nm program. +-NM=$lt_NM +- +-# A symbol stripping program +-STRIP=$lt_STRIP +- +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD +- +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" +- +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" +- +-# Used on cygwin: assembler. +-AS=$lt_AS +- +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir +- +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +- +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl_CXX +- +-# Object file suffix (normally "o"). +-objext="$ac_objext" +- +-# Old archive suffix (normally "a"). +-libext="$libext" +- +-# Shared library suffix (normally ".so"). +-shrext='$shrext' +- +-# Executable file suffix (normally ""). +-exeext="$exeext" +- +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic_CXX +-pic_mode=$pic_mode +- +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len +- +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX +- +-# Must we lock files when doing compilation ? +-need_locks=$lt_need_locks +- +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix +- +-# Do we need a version for libraries? +-need_version=$need_version +- +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +- +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self +- +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static +- +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static_CXX +- +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX +- +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX +- +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX +- +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX +- +-# Library versioning type. +-version_type=$version_type +- +-# Format of library name prefix. +-libname_spec=$lt_libname_spec +- +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec +- +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec +- +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_old_archive_cmds_CXX +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds +- +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX +- +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX +- +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_archive_cmds_CXX +-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds +- +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_module_cmds_CXX +-module_expsym_cmds=$lt_module_expsym_cmds_CXX +- +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_predep_objects_CXX +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_postdep_objects_CXX +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_predeps_CXX +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_postdeps_CXX +- +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +- +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method +- +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd +- +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag_CXX +- +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag_CXX +- +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds +- +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval +- +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +- +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +- +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +- +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var +- +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var +- +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath +- +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action_CXX +- +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs +- +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX +- +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX +- +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX +- +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$hardcode_direct_CXX +- +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$hardcode_minus_L_CXX +- +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX +- +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$hardcode_automatic_CXX +- +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" +- +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs_CXX +- +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +- +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +- +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_CXX" +- +-# Set to yes if exported symbols are required. +-always_export_symbols=$always_export_symbols_CXX +- +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds_CXX +- +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds +- +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms_CXX +- +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms_CXX +- +-# ### END LIBTOOL TAG CONFIG: $tagname +- +-__EOF__ +- +- +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi +-fi +- ++ ++ ++ ++ ++ ++ ++ fi # test -n "$compiler" ++ ++ CC=$lt_save_CC ++ LDCXX=$LD ++ LD=$lt_save_LD ++ GCC=$lt_save_GCC ++ with_gnu_ld=$lt_save_with_gnu_ld ++ lt_cv_path_LDCXX=$lt_cv_path_LD ++ lt_cv_path_LD=$lt_save_path_LD ++ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++fi # test "$_lt_caught_CXX_error" != yes + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -14077,7155 +16895,7 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +-CC=$lt_save_CC +-LDCXX=$LD +-LD=$lt_save_LD +-GCC=$lt_save_GCC +-with_gnu_ldcxx=$with_gnu_ld +-with_gnu_ld=$lt_save_with_gnu_ld +-lt_cv_path_LDCXX=$lt_cv_path_LD +-lt_cv_path_LD=$lt_save_path_LD +-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +- +- else +- tagname="" +- fi +- ;; +- +- F77) +- if test -n "$F77" && test "X$F77" != "Xno"; then +- +-ac_ext=f +-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' +-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_f77_compiler_gnu +- +- +-archive_cmds_need_lc_F77=no +-allow_undefined_flag_F77= +-always_export_symbols_F77=no +-archive_expsym_cmds_F77= +-export_dynamic_flag_spec_F77= +-hardcode_direct_F77=no +-hardcode_libdir_flag_spec_F77= +-hardcode_libdir_flag_spec_ld_F77= +-hardcode_libdir_separator_F77= +-hardcode_minus_L_F77=no +-hardcode_automatic_F77=no +-module_cmds_F77= +-module_expsym_cmds_F77= +-link_all_deplibs_F77=unknown +-old_archive_cmds_F77=$old_archive_cmds +-no_undefined_flag_F77= +-whole_archive_flag_spec_F77= +-enable_shared_with_static_runtimes_F77=no +- +-# Source file extension for f77 test sources. +-ac_ext=f +- +-# Object file extension for compiled f77 test sources. +-objext=o +-objext_F77=$objext +- +-# Code to be used in simple compile tests +-lt_simple_compile_test_code=" subroutine t\n return\n end\n" +- +-# Code to be used in simple link tests +-lt_simple_link_test_code=" program t\n end\n" +- +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +- +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} +- +-# Allow CC to be a program name with arguments. +-compiler=$CC +- +- +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${F77-"f77"} +-compiler=$CC +-compiler_F77=$CC +-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +- +-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 +-echo "$as_me:$LINENO: result: $can_build_shared" >&5 +-echo "${ECHO_T}$can_build_shared" >&6 +- +-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +-test "$can_build_shared" = "no" && enable_shared=no +- +-# On AIX, shared libraries and static libraries use the same namespace, and +-# are all built from PIC. +-case "$host_os" in +-aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; +-aix4*) +- test "$enable_shared" = yes && enable_static=no +- ;; +-esac +-echo "$as_me:$LINENO: result: $enable_shared" >&5 +-echo "${ECHO_T}$enable_shared" >&6 +- +-echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +-# Make sure either enable_shared or enable_static is yes. +-test "$enable_shared" = yes || enable_static=yes +-echo "$as_me:$LINENO: result: $enable_static" >&5 +-echo "${ECHO_T}$enable_static" >&6 +- +-test "$ld_shlibs_F77" = no && can_build_shared=no +- +-GCC_F77="$G77" +-LD_F77="$LD" +- +-lt_prog_compiler_wl_F77= +-lt_prog_compiler_pic_F77= +-lt_prog_compiler_static_F77= +- +-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +- +- if test "$GCC" = yes; then +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_static_F77='-static' +- +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- lt_prog_compiler_static_F77='-Bstatic' +- fi +- ;; +- +- amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' +- ;; +- +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. +- ;; +- +- mingw* | pw32* | os2*) +- # This hack is so that the source file can tell whether it is being +- # built for inclusion in a dll (and should export symbols for example). +- lt_prog_compiler_pic_F77='-DDLL_EXPORT' +- ;; +- +- darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- lt_prog_compiler_pic_F77='-fno-common' +- ;; +- +- msdosdjgpp*) +- # Just because we use GCC doesn't mean we suddenly get shared libraries +- # on systems that don't support them. +- lt_prog_compiler_can_build_shared_F77=no +- enable_shared=no +- ;; +- +- sysv4*MP*) +- if test -d /usr/nec; then +- lt_prog_compiler_pic_F77=-Kconform_pic +- fi +- ;; +- +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case "$host_cpu" in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- lt_prog_compiler_pic_F77='-fPIC' +- ;; +- esac +- ;; +- +- *) +- lt_prog_compiler_pic_F77='-fPIC' +- ;; +- esac +- else +- # PORTME Check for flag to pass linker flags through the system compiler. +- case $host_os in +- aix*) +- lt_prog_compiler_wl_F77='-Wl,' +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- lt_prog_compiler_static_F77='-Bstatic' +- else +- lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' +- fi +- ;; +- +- mingw* | pw32* | os2*) +- # This hack is so that the source file can tell whether it is being +- # built for inclusion in a dll (and should export symbols for example). +- lt_prog_compiler_pic_F77='-DDLL_EXPORT' +- ;; +- +- hpux9* | hpux10* | hpux11*) +- lt_prog_compiler_wl_F77='-Wl,' +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case "$host_cpu" in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- lt_prog_compiler_pic_F77='+Z' +- ;; +- esac +- # Is there a better lt_prog_compiler_static that works with the bundled CC? +- lt_prog_compiler_static_F77='${wl}-a ${wl}archive' +- ;; +- +- irix5* | irix6* | nonstopux*) +- lt_prog_compiler_wl_F77='-Wl,' +- # PIC (with -KPIC) is the default. +- lt_prog_compiler_static_F77='-non_shared' +- ;; +- +- newsos6) +- lt_prog_compiler_pic_F77='-KPIC' +- lt_prog_compiler_static_F77='-Bstatic' +- ;; +- +- linux*) +- case $CC in +- icc* | ecc*) +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_pic_F77='-KPIC' +- lt_prog_compiler_static_F77='-static' +- ;; +- ccc*) +- lt_prog_compiler_wl_F77='-Wl,' +- # All Alpha code is PIC. +- lt_prog_compiler_static_F77='-non_shared' +- ;; +- esac +- ;; +- +- osf3* | osf4* | osf5*) +- lt_prog_compiler_wl_F77='-Wl,' +- # All OSF/1 code is PIC. +- lt_prog_compiler_static_F77='-non_shared' +- ;; +- +- sco3.2v5*) +- lt_prog_compiler_pic_F77='-Kpic' +- lt_prog_compiler_static_F77='-dn' +- ;; +- +- solaris*) +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_pic_F77='-KPIC' +- lt_prog_compiler_static_F77='-Bstatic' +- ;; +- +- sunos4*) +- lt_prog_compiler_wl_F77='-Qoption ld ' +- lt_prog_compiler_pic_F77='-PIC' +- lt_prog_compiler_static_F77='-Bstatic' +- ;; +- +- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_pic_F77='-KPIC' +- lt_prog_compiler_static_F77='-Bstatic' +- ;; +- +- sysv4*MP*) +- if test -d /usr/nec ;then +- lt_prog_compiler_pic_F77='-Kconform_pic' +- lt_prog_compiler_static_F77='-Bstatic' +- fi +- ;; +- +- uts4*) +- lt_prog_compiler_pic_F77='-pic' +- lt_prog_compiler_static_F77='-Bstatic' +- ;; +- +- *) +- lt_prog_compiler_can_build_shared_F77=no +- ;; +- esac +- fi +- +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 +- +-# +-# Check to make sure the PIC flag actually works. +-# +-if test -n "$lt_prog_compiler_pic_F77"; then +- +-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 +-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_prog_compiler_pic_works_F77=no +- ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- lt_compiler_flag="$lt_prog_compiler_pic_F77" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. +- lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ +- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14398: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&5 +- echo "$as_me:14402: \$? = $ac_status" >&5 +- if (exit $ac_status) && test -s "$ac_outfile"; then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test ! -s conftest.err; then +- lt_prog_compiler_pic_works_F77=yes +- fi +- fi +- $rm conftest* +- +-fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 +- +-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then +- case $lt_prog_compiler_pic_F77 in +- "" | " "*) ;; +- *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; +- esac +-else +- lt_prog_compiler_pic_F77= +- lt_prog_compiler_can_build_shared_F77=no +-fi +- +-fi +-case "$host_os" in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- lt_prog_compiler_pic_F77= +- ;; +- *) +- lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" +- ;; +-esac +- +-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_cv_prog_compiler_c_o_F77=no +- $rm -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- +- lt_compiler_flag="-o out/conftest2.$ac_objext" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ +- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14458: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&5 +- echo "$as_me:14462: \$? = $ac_status" >&5 +- if (exit $ac_status) && test -s out/conftest2.$ac_objext +- then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test ! -s out/conftest.err; then +- lt_cv_prog_compiler_c_o_F77=yes +- fi +- fi +- chmod u+w . +- $rm conftest* +- # SGI C++ compiler will create directory out/ii_files/ for +- # template instantiation +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out +- cd .. +- rmdir conftest +- $rm conftest* +- +-fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 +- +- +-hard_links="nottested" +-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then +- # do not overwrite the value of need_locks provided by the user +- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 +- hard_links=yes +- $rm conftest* +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- touch conftest.a +- ln conftest.a conftest.b 2>&5 || hard_links=no +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6 +- if test "$hard_links" = no; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} +- need_locks=warn +- fi +-else +- need_locks=no +-fi +- +-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +- +- runpath_var= +- allow_undefined_flag_F77= +- enable_shared_with_static_runtimes_F77=no +- archive_cmds_F77= +- archive_expsym_cmds_F77= +- old_archive_From_new_cmds_F77= +- old_archive_from_expsyms_cmds_F77= +- export_dynamic_flag_spec_F77= +- whole_archive_flag_spec_F77= +- thread_safe_flag_spec_F77= +- hardcode_libdir_flag_spec_F77= +- hardcode_libdir_flag_spec_ld_F77= +- hardcode_libdir_separator_F77= +- hardcode_direct_F77=no +- hardcode_minus_L_F77=no +- hardcode_shlibpath_var_F77=unsupported +- link_all_deplibs_F77=unknown +- hardcode_automatic_F77=no +- module_cmds_F77= +- module_expsym_cmds_F77= +- always_export_symbols_F77=no +- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- # include_expsyms should be a list of space-separated symbols to be *always* +- # included in the symbol list +- include_expsyms_F77= +- # exclude_expsyms can be an extended regexp of symbols to exclude +- # it will be wrapped by ` (' and `)$', so one must not match beginning or +- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', +- # as well as any symbol that contains `d'. +- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" +- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out +- # platforms (ab)use it in PIC code, but their linkers get confused if +- # the symbol is explicitly referenced. Since portable code cannot +- # rely on this symbol name, it's probably fine to never include it in +- # preloaded symbol tables. +- extract_expsyms_cmds= +- +- case $host_os in +- cygwin* | mingw* | pw32*) +- # FIXME: the MSVC++ port hasn't been tested in a loooong time +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- if test "$GCC" != yes; then +- with_gnu_ld=no +- fi +- ;; +- openbsd*) +- with_gnu_ld=no +- ;; +- esac +- +- ld_shlibs_F77=yes +- if test "$with_gnu_ld" = yes; then +- # If archive_cmds runs LD, not CC, wlarc should be empty +- wlarc='${wl}' +- +- # See if GNU ld supports shared libraries. +- case $host_os in +- aix3* | aix4* | aix5*) +- # On AIX/PPC, the GNU linker is very broken +- if test "$host_cpu" != ia64; then +- ld_shlibs_F77=no +- cat <&2 +- +-*** Warning: the GNU linker, at least up to release 2.9.1, is reported +-*** to be unable to reliably create shared libraries on AIX. +-*** Therefore, libtool is disabling shared libraries support. If you +-*** really care for shared libraries, you may want to modify your PATH +-*** so that a non-GNU linker is found, and then restart. +- +-EOF +- fi +- ;; +- +- amigaos*) +- archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_minus_L_F77=yes +- +- # Samuel A. Falvo II reports +- # that the semantics of dynamic libraries on AmigaOS, at least up +- # to version 4, is to share data among multiple programs linked +- # with the same dynamic library. Since this doesn't match the +- # behavior of shared libraries on other platforms, we can't use +- # them. +- ld_shlibs_F77=no +- ;; +- +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- allow_undefined_flag_F77=unsupported +- # Joseph Beckenbach says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- ld_shlibs_F77=no +- fi +- ;; +- +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, +- # as there is no search path for DLLs. +- hardcode_libdir_flag_spec_F77='-L$libdir' +- allow_undefined_flag_F77=unsupported +- always_export_symbols_F77=no +- enable_shared_with_static_runtimes_F77=yes +- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' +- +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' +- else +- ld_shlibs=no +- fi +- ;; +- +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' +- wlarc= +- else +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- fi +- ;; +- +- solaris* | sysv5*) +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then +- ld_shlibs_F77=no +- cat <&2 +- +-*** Warning: The releases 2.8.* of the GNU linker cannot reliably +-*** create shared libraries on Solaris systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.9.1 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. +- +-EOF +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- ld_shlibs_F77=no +- fi +- ;; +- +- sunos4*) +- archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- wlarc= +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no +- ;; +- +- linux*) +- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then +- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_cmds_F77="$tmp_archive_cmds" +- supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in +- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac +- if test $supports_anon_versioning = yes; then +- archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ +-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +-$echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- else +- archive_expsym_cmds_F77="$tmp_archive_cmds" +- fi +- else +- ld_shlibs_F77=no +- fi +- ;; +- +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- ld_shlibs_F77=no +- fi +- ;; +- esac +- +- if test "$ld_shlibs_F77" = yes; then +- runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' +- export_dynamic_flag_spec_F77='${wl}--export-dynamic' +- # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +- whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- whole_archive_flag_spec_F77= +- fi +- fi +- else +- # PORTME fill in a description of your system's linker (not GNU ld) +- case $host_os in +- aix3*) +- allow_undefined_flag_F77=unsupported +- always_export_symbols_F77=yes +- archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' +- # Note: this linker hardcodes the directories in LIBPATH if there +- # are no directories specified by -L. +- hardcode_minus_L_F77=yes +- if test "$GCC" = yes && test -z "$link_static_flag"; then +- # Neither direct hardcoding nor static linking is supported with a +- # broken collect2. +- hardcode_direct_F77=unsupported +- fi +- ;; +- +- aix4* | aix5*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- # If we're using GNU nm, then we don't want the "-C" option. +- # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' +- else +- export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' +- fi +- aix_use_runtimelinking=no +- +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) +- for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi +- done +- esac +- +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi +- +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +- +- archive_cmds_F77='' +- hardcode_direct_F77=yes +- hardcode_libdir_separator_F77=':' +- link_all_deplibs_F77=yes +- +- if test "$GCC" = yes; then +- case $host_os in aix4.012|aix4.012.*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- hardcode_direct_F77=yes +- else +- # We have old collect2 +- hardcode_direct_F77=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- hardcode_minus_L_F77=yes +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_libdir_separator_F77= +- fi +- esac +- shared_flag='-shared' +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi +- +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- always_export_symbols_F77=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- allow_undefined_flag_F77='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF +- program main +- +- end +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +- +- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" +- archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' +- allow_undefined_flag_F77="-z nodefs" +- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF +- program main +- +- end +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +- +- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- no_undefined_flag_F77=' ${wl}-bernotok' +- allow_undefined_flag_F77=' ${wl}-berok' +- # -bexpall does not export symbols beginning with underscore (_) +- always_export_symbols_F77=yes +- # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec_F77=' ' +- archive_cmds_need_lc_F77=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; +- +- amigaos*) +- archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_minus_L_F77=yes +- # see comment about different semantics on the GNU ld section +- ld_shlibs_F77=no +- ;; +- +- bsdi4*) +- export_dynamic_flag_spec_F77=-rdynamic +- ;; +- +- cygwin* | mingw* | pw32*) +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- # hardcode_libdir_flag_spec is actually meaningless, as there is +- # no search path for DLLs. +- hardcode_libdir_flag_spec_F77=' ' +- allow_undefined_flag_F77=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext=".dll" +- # FIXME: Setting linknames here is a bad hack. +- archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- old_archive_From_new_cmds_F77='true' +- # FIXME: Should let the user specify the lib program. +- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes_F77=yes +- ;; +- +- darwin* | rhapsody*) +- if test "$GXX" = yes ; then +- archive_cmds_need_lc_F77=no +- case "$host_os" in +- rhapsody* | darwin1.[012]) +- allow_undefined_flag_F77='-undefined suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- allow_undefined_flag_F77='-flat_namespace -undefined suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- allow_undefined_flag_F77='-flat_namespace -undefined suppress' +- ;; +- 10.*) +- allow_undefined_flag_F77='-undefined dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- lt_int_apple_cc_single_mod=no +- output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes +- fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- hardcode_direct_F77=no +- hardcode_automatic_F77=yes +- hardcode_shlibpath_var_F77=unsupported +- whole_archive_flag_spec_F77='-all_load $convenience' +- link_all_deplibs_F77=yes +- else +- ld_shlibs_F77=no +- fi +- ;; +- +- dgux*) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_shlibpath_var_F77=no +- ;; +- +- freebsd1*) +- ld_shlibs_F77=no +- ;; +- +- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor +- # support. Future versions do this automatically, but an explicit c++rt0.o +- # does not break anything, and helps significantly (at the cost of a little +- # extra space). +- freebsd2.2*) +- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- hardcode_libdir_flag_spec_F77='-R$libdir' +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no +- ;; +- +- # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) +- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_F77=yes +- hardcode_minus_L_F77=yes +- hardcode_shlibpath_var_F77=no +- ;; +- +- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu) +- archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_F77='-R$libdir' +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no +- ;; +- +- hpux9*) +- if test "$GCC" = yes; then +- archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- fi +- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_F77=: +- hardcode_direct_F77=yes +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L_F77=yes +- export_dynamic_flag_spec_F77='${wl}-E' +- ;; +- +- hpux10* | hpux11*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*|ia64*) +- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- else +- case "$host_cpu" in +- hppa*64*|ia64*) +- archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' +- ;; +- *) +- archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +- ;; +- esac +- fi +- if test "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*) +- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' +- hardcode_libdir_flag_spec_ld_F77='+b $libdir' +- hardcode_libdir_separator_F77=: +- hardcode_direct_F77=no +- hardcode_shlibpath_var_F77=no +- ;; +- ia64*) +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_direct_F77=no +- hardcode_shlibpath_var_F77=no +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L_F77=yes +- ;; +- *) +- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_F77=: +- hardcode_direct_F77=yes +- export_dynamic_flag_spec_F77='${wl}-E' +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L_F77=yes +- ;; +- esac +- fi +- ;; +- +- irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' +- fi +- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_F77=: +- link_all_deplibs_F77=yes +- ;; +- +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out +- else +- archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF +- fi +- hardcode_libdir_flag_spec_F77='-R$libdir' +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no +- ;; +- +- newsos6) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_F77=yes +- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_F77=: +- hardcode_shlibpath_var_F77=no +- ;; +- +- openbsd*) +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_F77='${wl}-E' +- else +- case $host_os in +- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) +- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_F77='-R$libdir' +- ;; +- *) +- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' +- ;; +- esac +- fi +- ;; +- +- os2*) +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_minus_L_F77=yes +- allow_undefined_flag_F77=unsupported +- archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +- old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' +- ;; +- +- osf3*) +- if test "$GCC" = yes; then +- allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- allow_undefined_flag_F77=' -expect_unresolved \*' +- archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- fi +- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_F77=: +- ;; +- +- osf4* | osf5*) # as osf3* with the addition of -msym flag +- if test "$GCC" = yes; then +- allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' +- else +- allow_undefined_flag_F77=' -expect_unresolved \*' +- archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' +- +- # Both c and cxx compiler support -rpath directly +- hardcode_libdir_flag_spec_F77='-rpath $libdir' +- fi +- hardcode_libdir_separator_F77=: +- ;; +- +- sco3.2v5*) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var_F77=no +- export_dynamic_flag_spec_F77='${wl}-Bexport' +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- ;; +- +- solaris*) +- no_undefined_flag_F77=' -z text' +- if test "$GCC" = yes; then +- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' +- else +- archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' +- fi +- hardcode_libdir_flag_spec_F77='-R$libdir' +- hardcode_shlibpath_var_F77=no +- case $host_os in +- solaris2.[0-5] | solaris2.[0-5].*) ;; +- *) # Supported since Solaris 2.6 (maybe 2.5.1?) +- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; +- esac +- link_all_deplibs_F77=yes +- ;; +- +- sunos4*) +- if test "x$host_vendor" = xsequent; then +- # Use $CC to link under sequent, because it throws in some extra .o +- # files that make .init and .fini sections work. +- archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' +- fi +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_direct_F77=yes +- hardcode_minus_L_F77=yes +- hardcode_shlibpath_var_F77=no +- ;; +- +- sysv4) +- case $host_vendor in +- sni) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_F77=yes # is this really true??? +- ;; +- siemens) +- ## LD is ld it makes a PLAMLIB +- ## CC just makes a GrossModule. +- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- reload_cmds_F77='$CC -r -o $output$reload_objs' +- hardcode_direct_F77=no +- ;; +- motorola) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie +- ;; +- esac +- runpath_var='LD_RUN_PATH' +- hardcode_shlibpath_var_F77=no +- ;; +- +- sysv4.3*) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var_F77=no +- export_dynamic_flag_spec_F77='-Bexport' +- ;; +- +- sysv4*MP*) +- if test -d /usr/nec; then +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var_F77=no +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- ld_shlibs_F77=yes +- fi +- ;; +- +- sysv4.2uw2*) +- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_F77=yes +- hardcode_minus_L_F77=no +- hardcode_shlibpath_var_F77=no +- hardcode_runpath_var=yes +- runpath_var=LD_RUN_PATH +- ;; +- +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) +- no_undefined_flag_F77='${wl}-z ${wl}text' +- if test "$GCC" = yes; then +- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- runpath_var='LD_RUN_PATH' +- hardcode_shlibpath_var_F77=no +- ;; +- +- sysv5*) +- no_undefined_flag_F77=' -z text' +- # $CC -shared without GNU ld will not create a library from C++ +- # object files and a static libstdc++, better avoid it by now +- archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' +- hardcode_libdir_flag_spec_F77= +- hardcode_shlibpath_var_F77=no +- runpath_var='LD_RUN_PATH' +- ;; +- +- uts4*) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_shlibpath_var_F77=no +- ;; +- +- *) +- ld_shlibs_F77=no +- ;; +- esac +- fi +- +-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +-echo "${ECHO_T}$ld_shlibs_F77" >&6 +-test "$ld_shlibs_F77" = no && can_build_shared=no +- +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi +- +-# +-# Do we need to explicitly link libc? +-# +-case "x$archive_cmds_need_lc_F77" in +-x|xyes) +- # Assume -lc should be added +- archive_cmds_need_lc_F77=yes +- +- if test "$enable_shared" = yes && test "$GCC" = yes; then +- case $archive_cmds_F77 in +- *'~'*) +- # FIXME: we may have to deal with multi-command sequences. +- ;; +- '$CC '*) +- # Test whether the compiler implicitly links with -lc since on some +- # systems, -lgcc has to come before -lc. If gcc already passes -lc +- # to ld, don't add -lc before -lgcc. +- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 +- $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } 2>conftest.err; then +- soname=conftest +- lib=conftest +- libobjs=conftest.$ac_objext +- deplibs= +- wl=$lt_prog_compiler_wl_F77 +- compiler_flags=-v +- linker_flags=-v +- verstring= +- output_objdir=. +- libname=conftest +- lt_save_allow_undefined_flag=$allow_undefined_flag_F77 +- allow_undefined_flag_F77= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 +- (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +- then +- archive_cmds_need_lc_F77=no +- else +- archive_cmds_need_lc_F77=yes +- fi +- allow_undefined_flag_F77=$lt_save_allow_undefined_flag +- else +- cat conftest.err 1>&5 +- fi +- $rm conftest* +- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 +- ;; +- esac +- fi +- ;; +-esac +- +-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +-library_names_spec= +-libname_spec='lib$name' +-soname_spec= +-shrext=".so" +-postinstall_cmds= +-postuninstall_cmds= +-finish_cmds= +-finish_eval= +-shlibpath_var= +-shlibpath_overrides_runpath=unknown +-version_type=none +-dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi +-need_lib_prefix=unknown +-hardcode_into_libs=no +- +-# when you set need_version to no, make sure it does not cause -set_version +-# flags to be left without arguments +-need_version=unknown +- +-case $host_os in +-aix3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' +- shlibpath_var=LIBPATH +- +- # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- +-aix4* | aix5*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- hardcode_into_libs=yes +- if test "$host_cpu" = ia64; then +- # AIX 5 supports IA64 +- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- else +- # With GCC up to 2.95.x, collect2 would create an import file +- # for dependence libraries. The import file would start with +- # the line `#! .'. This would cause the generated library to +- # depend on `.', always an invalid library. This was fixed in +- # development snapshots of GCC prior to 3.0. +- case $host_os in +- aix4 | aix4.[01] | aix4.[01].*) +- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' +- echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then +- : +- else +- can_build_shared=no +- fi +- ;; +- esac +- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct +- # soname into executable. Probably we can add versioning support to +- # collect2, so additional links can be useful in future. +- if test "$aix_use_runtimelinking" = yes; then +- # If using run time linking (on AIX 4.2 or later) use lib.so +- # instead of lib.a to let people know that these are not +- # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- else +- # We preserve .a as extension for shared libraries through AIX4.2 +- # and later when we are not doing run time linking. +- library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' +- fi +- shlibpath_var=LIBPATH +- fi +- ;; +- +-amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' +- ;; +- +-beos*) +- library_names_spec='${libname}${shared_ext}' +- dynamic_linker="$host_os ld.so" +- shlibpath_var=LIBRARY_PATH +- ;; +- +-bsdi4*) +- version_type=linux +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" +- # the default ld.so.conf also contains /usr/contrib/lib and +- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow +- # libtool to hard-code these into programs +- ;; +- +-cygwin* | mingw* | pw32*) +- version_type=windows +- shrext=".dll" +- need_version=no +- need_lib_prefix=no +- +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) +- library_names_spec='$libname.dll.a' +- # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ +- dldir=$destdir/`dirname \$dlpath`~ +- test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname' +- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ +- dlpath=$dir/\$dldll~ +- $rm \$dlpath' +- shlibpath_overrides_runpath=yes +- +- case $host_os in +- cygwin*) +- # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +- ;; +- mingw*) +- # MinGW DLLs use traditional 'lib' prefix +- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then +- # It is most probably a Windows format PATH printed by +- # mingw gcc, but we are running on Cygwin. Gcc prints its search +- # path with ; separators, and with drive letters. We can handle the +- # drive letters (cygwin fileutils understands them), so leave them, +- # especially as we might pass files found there to a mingw objdump, +- # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +- ;; +- pw32*) +- # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' +- ;; +- esac +- ;; +- +- *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' +- ;; +- esac +- dynamic_linker='Win32 ld.exe' +- # FIXME: first we should search . and the directory the executable is in +- shlibpath_var=PATH +- ;; +- +-darwin* | rhapsody*) +- dynamic_linker="$host_os dyld" +- version_type=darwin +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' +- shlibpath_overrides_runpath=yes +- shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi +- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' +- ;; +- +-dgux*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- ;; +- +-freebsd1*) +- dynamic_linker=no +- ;; +- +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- +-freebsd*) +- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +- version_type=freebsd-$objformat +- case $version_type in +- freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- need_version=no +- need_lib_prefix=no +- ;; +- freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' +- need_version=yes +- ;; +- esac +- shlibpath_var=LD_LIBRARY_PATH +- case $host_os in +- freebsd2*) +- shlibpath_overrides_runpath=yes +- ;; +- freebsd3.01* | freebsdelf3.01*) +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- *) # from 3.2 on +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- esac +- ;; +- +-gnu*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- hardcode_into_libs=yes +- ;; +- +-hpux9* | hpux10* | hpux11*) +- # Give a soname corresponding to the major version so that dld.sl refuses to +- # link against other versions. +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- case "$host_cpu" in +- ia64*) +- shrext='.so' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.so" +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- if test "X$HPUX_IA64_MODE" = X32; then +- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" +- else +- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" +- fi +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- hppa*64*) +- shrext='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext='.sl' +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=SHLIB_PATH +- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555. +- postinstall_cmds='chmod 555 $lib' +- ;; +- +-irix5* | irix6* | nonstopux*) +- case $host_os in +- nonstopux*) version_type=nonstopux ;; +- *) +- if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux +- else +- version_type=irix +- fi ;; +- esac +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' +- case $host_os in +- irix5* | nonstopux*) +- libsuff= shlibsuff= +- ;; +- *) +- case $LD in # libtool.m4 will add one of these switches to LD +- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") +- libsuff= shlibsuff= libmagic=32-bit;; +- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") +- libsuff=32 shlibsuff=N32 libmagic=N32;; +- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") +- libsuff=64 shlibsuff=64 libmagic=64-bit;; +- *) libsuff= shlibsuff= libmagic=never-match;; +- esac +- ;; +- esac +- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" +- hardcode_into_libs=yes +- ;; +- +-# No shared lib support for Linux oldld, aout, or coff. +-linux*oldld* | linux*aout* | linux*coff*) +- dynamic_linker=no +- ;; +- +-# This must be Linux ELF. +-linux*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- # This implies no fast_install, which is unacceptable. +- # Some rework will be needed to allow for fast_install +- # before this can be enabled. +- hardcode_into_libs=yes +- +- # Append ld.so.conf contents to the search path +- if test -f /etc/ld.so.conf; then +- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" +- fi +- +- # We used to test for /lib/ld.so.1 and disable shared libraries on +- # powerpc, because MkLinux only supported shared libraries with the +- # GNU dynamic linker. Since this was broken with cross compilers, +- # most powerpc-linux boxes support dynamic linking these days and +- # people can always --disable-shared, the test was removed, and we +- # assume the GNU/Linux dynamic linker is in use. +- dynamic_linker='GNU/Linux ld.so' +- ;; +- +-knetbsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- +-netbsd*) +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- dynamic_linker='NetBSD (a.out) ld.so' +- else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='NetBSD ld.elf_so' +- fi +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- +-newsos6) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; +- +-nto-qnx*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; +- +-openbsd*) +- version_type=sunos +- need_lib_prefix=no +- need_version=yes +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- case $host_os in +- openbsd2.[89] | openbsd2.[89].*) +- shlibpath_overrides_runpath=no +- ;; +- *) +- shlibpath_overrides_runpath=yes +- ;; +- esac +- else +- shlibpath_overrides_runpath=yes +- fi +- ;; +- +-os2*) +- libname_spec='$name' +- shrext=".dll" +- need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' +- dynamic_linker='OS/2 ld.exe' +- shlibpath_var=LIBPATH +- ;; +- +-osf3* | osf4* | osf5*) +- version_type=osf +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" +- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" +- ;; +- +-sco3.2v5*) +- version_type=osf +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- ;; +- +-solaris*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- # ldd complains unless libraries are executable +- postinstall_cmds='chmod +x $lib' +- ;; +- +-sunos4*) +- version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- fi +- need_version=yes +- ;; +- +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- case $host_vendor in +- sni) +- shlibpath_overrides_runpath=no +- need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' +- runpath_var=LD_RUN_PATH +- ;; +- siemens) +- need_lib_prefix=no +- ;; +- motorola) +- need_lib_prefix=no +- need_version=no +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' +- ;; +- esac +- ;; +- +-sysv4*MP*) +- if test -d /usr/nec ;then +- version_type=linux +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' +- shlibpath_var=LD_LIBRARY_PATH +- fi +- ;; +- +-uts4*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- ;; +- +-*) +- dynamic_linker=no +- ;; +-esac +-echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6 +-test "$dynamic_linker" = no && can_build_shared=no +- +-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +-hardcode_action_F77= +-if test -n "$hardcode_libdir_flag_spec_F77" || \ +- test -n "$runpath_var F77" || \ +- test "X$hardcode_automatic_F77"="Xyes" ; then +- +- # We can hardcode non-existant directories. +- if test "$hardcode_direct_F77" != no && +- # If the only mechanism to avoid hardcoding is shlibpath_var, we +- # have to relink, otherwise we might link with an installed library +- # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && +- test "$hardcode_minus_L_F77" != no; then +- # Linking always hardcodes the temporary library directory. +- hardcode_action_F77=relink +- else +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- hardcode_action_F77=immediate +- fi +-else +- # We cannot hardcode anything, or else we can only hardcode existing +- # directories. +- hardcode_action_F77=unsupported +-fi +-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +-echo "${ECHO_T}$hardcode_action_F77" >&6 +- +-if test "$hardcode_action_F77" = relink; then +- # Fast installation is not supported +- enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then +- # Fast installation is not necessary +- enable_fast_install=needless +-fi +- +-striplib= +-old_striplib= +-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then +- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" +- test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +-else +-# FIXME - insert some real tests, host_os isn't really good enough +- case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- ;; +- *) +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +- ;; +- esac +-fi +- +- +- +-# The else clause should only fire when bootstrapping the +-# libtool distribution, otherwise you forgot to ship ltmain.sh +-# with your package, and you will get complaints that there are +-# no rules to generate ltmain.sh. +-if test -f "$ltmain"; then +- # See if we are running on zsh, and set the options which allow our commands through +- # without removal of \ escapes. +- if test -n "${ZSH_VERSION+set}" ; then +- setopt NO_GLOB_SUBST +- fi +- # Now quote all the things that may contain metacharacters while being +- # careful not to overquote the AC_SUBSTed values. We take copies of the +- # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \ +- SED SHELL STRIP \ +- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ +- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ +- deplibs_check_method reload_flag reload_cmds need_locks \ +- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ +- lt_cv_sys_global_symbol_to_c_name_address \ +- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ +- old_postinstall_cmds old_postuninstall_cmds \ +- compiler_F77 \ +- CC_F77 \ +- LD_F77 \ +- lt_prog_compiler_wl_F77 \ +- lt_prog_compiler_pic_F77 \ +- lt_prog_compiler_static_F77 \ +- lt_prog_compiler_no_builtin_flag_F77 \ +- export_dynamic_flag_spec_F77 \ +- thread_safe_flag_spec_F77 \ +- whole_archive_flag_spec_F77 \ +- enable_shared_with_static_runtimes_F77 \ +- old_archive_cmds_F77 \ +- old_archive_from_new_cmds_F77 \ +- predep_objects_F77 \ +- postdep_objects_F77 \ +- predeps_F77 \ +- postdeps_F77 \ +- compiler_lib_search_path_F77 \ +- archive_cmds_F77 \ +- archive_expsym_cmds_F77 \ +- postinstall_cmds_F77 \ +- postuninstall_cmds_F77 \ +- old_archive_from_expsyms_cmds_F77 \ +- allow_undefined_flag_F77 \ +- no_undefined_flag_F77 \ +- export_symbols_cmds_F77 \ +- hardcode_libdir_flag_spec_F77 \ +- hardcode_libdir_flag_spec_ld_F77 \ +- hardcode_libdir_separator_F77 \ +- hardcode_automatic_F77 \ +- module_cmds_F77 \ +- module_expsym_cmds_F77 \ +- lt_cv_prog_compiler_c_o_F77 \ +- exclude_expsyms_F77 \ +- include_expsyms_F77; do +- +- case $var in +- old_archive_cmds_F77 | \ +- old_archive_from_new_cmds_F77 | \ +- archive_cmds_F77 | \ +- archive_expsym_cmds_F77 | \ +- module_cmds_F77 | \ +- module_expsym_cmds_F77 | \ +- old_archive_from_expsyms_cmds_F77 | \ +- export_symbols_cmds_F77 | \ +- extract_expsyms_cmds | reload_cmds | finish_cmds | \ +- postinstall_cmds | postuninstall_cmds | \ +- old_postinstall_cmds | old_postuninstall_cmds | \ +- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) +- # Double-quote double-evaled strings. +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" +- ;; +- *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" +- ;; +- esac +- done +- +- case $lt_echo in +- *'\$0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` +- ;; +- esac +- +-cfgfile="$ofile" +- +- cat <<__EOF__ >> "$cfgfile" +-# ### BEGIN LIBTOOL TAG CONFIG: $tagname +- +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +- +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL +- +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared +- +-# Whether or not to build static libraries. +-build_old_libs=$enable_static +- +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc_F77 +- +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 +- +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install +- +-# The host system. +-host_alias=$host_alias +-host=$host +- +-# An echo program that does not interpret backslashes. +-echo=$lt_echo +- +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS +- +-# A C compiler. +-LTCC=$lt_LTCC +- +-# A language-specific compiler. +-CC=$lt_compiler_F77 +- +-# Is the compiler the GNU C compiler? +-with_gcc=$GCC_F77 +- +-# An ERE matcher. +-EGREP=$lt_EGREP +- +-# The linker used to build libraries. +-LD=$lt_LD_F77 +- +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S +- +-# A BSD-compatible nm program. +-NM=$lt_NM +- +-# A symbol stripping program +-STRIP=$lt_STRIP +- +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD +- +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" +- +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" +- +-# Used on cygwin: assembler. +-AS=$lt_AS +- +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir +- +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +- +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl_F77 +- +-# Object file suffix (normally "o"). +-objext="$ac_objext" +- +-# Old archive suffix (normally "a"). +-libext="$libext" +- +-# Shared library suffix (normally ".so"). +-shrext='$shrext' +- +-# Executable file suffix (normally ""). +-exeext="$exeext" +- +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic_F77 +-pic_mode=$pic_mode +- +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len +- +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 +- +-# Must we lock files when doing compilation ? +-need_locks=$lt_need_locks +- +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix +- +-# Do we need a version for libraries? +-need_version=$need_version +- +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +- +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self +- +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static +- +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static_F77 +- +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 +- +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 +- +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 +- +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 +- +-# Library versioning type. +-version_type=$version_type +- +-# Format of library name prefix. +-libname_spec=$lt_libname_spec +- +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec +- +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec +- +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_old_archive_cmds_F77 +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds +- +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 +- +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 +- +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_archive_cmds_F77 +-archive_expsym_cmds=$lt_archive_expsym_cmds_F77 +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds +- +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_module_cmds_F77 +-module_expsym_cmds=$lt_module_expsym_cmds_F77 +- +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_predep_objects_F77 +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_postdep_objects_F77 +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_predeps_F77 +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_postdeps_F77 +- +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path_F77 +- +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method +- +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd +- +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag_F77 +- +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag_F77 +- +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds +- +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval +- +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +- +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +- +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +- +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var +- +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var +- +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath +- +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action_F77 +- +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs +- +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 +- +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 +- +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 +- +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$hardcode_direct_F77 +- +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$hardcode_minus_L_F77 +- +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 +- +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$hardcode_automatic_F77 +- +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" +- +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs_F77 +- +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +- +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +- +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_F77" +- +-# Set to yes if exported symbols are required. +-always_export_symbols=$always_export_symbols_F77 +- +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds_F77 +- +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds +- +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms_F77 +- +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms_F77 +- +-# ### END LIBTOOL TAG CONFIG: $tagname +- +-__EOF__ +- +- +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi +-fi +- +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-CC="$lt_save_CC" +- +- else +- tagname="" +- fi +- ;; +- +- GCJ) +- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then +- +- +- +-# Source file extension for Java test sources. +-ac_ext=java +- +-# Object file extension for compiled Java test sources. +-objext=o +-objext_GCJ=$objext +- +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="class foo {}\n" +- +-# Code to be used in simple link tests +-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n' +- +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +- +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} +- +-# Allow CC to be a program name with arguments. +-compiler=$CC +- +- +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${GCJ-"gcj"} +-compiler=$CC +-compiler_GCJ=$CC +- +-# GCJ did not exist at the time GCC didn't implicitly link libc in. +-archive_cmds_need_lc_GCJ=no +- +- +-lt_prog_compiler_no_builtin_flag_GCJ= +- +-if test "$GCC" = yes; then +- lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' +- +- +-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_cv_prog_compiler_rtti_exceptions=no +- ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- lt_compiler_flag="-fno-rtti -fno-exceptions" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. +- lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ +- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16492: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&5 +- echo "$as_me:16496: \$? = $ac_status" >&5 +- if (exit $ac_status) && test -s "$ac_outfile"; then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test ! -s conftest.err; then +- lt_cv_prog_compiler_rtti_exceptions=yes +- fi +- fi +- $rm conftest* +- +-fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +- +-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +- lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" +-else +- : +-fi +- +-fi +- +-lt_prog_compiler_wl_GCJ= +-lt_prog_compiler_pic_GCJ= +-lt_prog_compiler_static_GCJ= +- +-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +- +- if test "$GCC" = yes; then +- lt_prog_compiler_wl_GCJ='-Wl,' +- lt_prog_compiler_static_GCJ='-static' +- +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- lt_prog_compiler_static_GCJ='-Bstatic' +- fi +- ;; +- +- amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' +- ;; +- +- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. +- ;; +- +- mingw* | pw32* | os2*) +- # This hack is so that the source file can tell whether it is being +- # built for inclusion in a dll (and should export symbols for example). +- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' +- ;; +- +- darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- lt_prog_compiler_pic_GCJ='-fno-common' +- ;; +- +- msdosdjgpp*) +- # Just because we use GCC doesn't mean we suddenly get shared libraries +- # on systems that don't support them. +- lt_prog_compiler_can_build_shared_GCJ=no +- enable_shared=no +- ;; +- +- sysv4*MP*) +- if test -d /usr/nec; then +- lt_prog_compiler_pic_GCJ=-Kconform_pic +- fi +- ;; +- +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case "$host_cpu" in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- lt_prog_compiler_pic_GCJ='-fPIC' +- ;; +- esac +- ;; +- +- *) +- lt_prog_compiler_pic_GCJ='-fPIC' +- ;; +- esac +- else +- # PORTME Check for flag to pass linker flags through the system compiler. +- case $host_os in +- aix*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- lt_prog_compiler_static_GCJ='-Bstatic' +- else +- lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' +- fi +- ;; +- +- mingw* | pw32* | os2*) +- # This hack is so that the source file can tell whether it is being +- # built for inclusion in a dll (and should export symbols for example). +- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' +- ;; +- +- hpux9* | hpux10* | hpux11*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case "$host_cpu" in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- lt_prog_compiler_pic_GCJ='+Z' +- ;; +- esac +- # Is there a better lt_prog_compiler_static that works with the bundled CC? +- lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive' +- ;; +- +- irix5* | irix6* | nonstopux*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- # PIC (with -KPIC) is the default. +- lt_prog_compiler_static_GCJ='-non_shared' +- ;; +- +- newsos6) +- lt_prog_compiler_pic_GCJ='-KPIC' +- lt_prog_compiler_static_GCJ='-Bstatic' +- ;; +- +- linux*) +- case $CC in +- icc* | ecc*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- lt_prog_compiler_pic_GCJ='-KPIC' +- lt_prog_compiler_static_GCJ='-static' +- ;; +- ccc*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- # All Alpha code is PIC. +- lt_prog_compiler_static_GCJ='-non_shared' +- ;; +- esac +- ;; +- +- osf3* | osf4* | osf5*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- # All OSF/1 code is PIC. +- lt_prog_compiler_static_GCJ='-non_shared' +- ;; +- +- sco3.2v5*) +- lt_prog_compiler_pic_GCJ='-Kpic' +- lt_prog_compiler_static_GCJ='-dn' +- ;; +- +- solaris*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- lt_prog_compiler_pic_GCJ='-KPIC' +- lt_prog_compiler_static_GCJ='-Bstatic' +- ;; +- +- sunos4*) +- lt_prog_compiler_wl_GCJ='-Qoption ld ' +- lt_prog_compiler_pic_GCJ='-PIC' +- lt_prog_compiler_static_GCJ='-Bstatic' +- ;; +- +- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- lt_prog_compiler_pic_GCJ='-KPIC' +- lt_prog_compiler_static_GCJ='-Bstatic' +- ;; +- +- sysv4*MP*) +- if test -d /usr/nec ;then +- lt_prog_compiler_pic_GCJ='-Kconform_pic' +- lt_prog_compiler_static_GCJ='-Bstatic' +- fi +- ;; +- +- uts4*) +- lt_prog_compiler_pic_GCJ='-pic' +- lt_prog_compiler_static_GCJ='-Bstatic' +- ;; +- +- *) +- lt_prog_compiler_can_build_shared_GCJ=no +- ;; +- esac +- fi +- +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 +- +-# +-# Check to make sure the PIC flag actually works. +-# +-if test -n "$lt_prog_compiler_pic_GCJ"; then +- +-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 +-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_prog_compiler_pic_works_GCJ=no +- ac_outfile=conftest.$ac_objext +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- lt_compiler_flag="$lt_prog_compiler_pic_GCJ" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. +- lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ +- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16725: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&5 +- echo "$as_me:16729: \$? = $ac_status" >&5 +- if (exit $ac_status) && test -s "$ac_outfile"; then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test ! -s conftest.err; then +- lt_prog_compiler_pic_works_GCJ=yes +- fi +- fi +- $rm conftest* +- +-fi +-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 +- +-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then +- case $lt_prog_compiler_pic_GCJ in +- "" | " "*) ;; +- *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; +- esac +-else +- lt_prog_compiler_pic_GCJ= +- lt_prog_compiler_can_build_shared_GCJ=no +-fi +- +-fi +-case "$host_os" in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- lt_prog_compiler_pic_GCJ= +- ;; +- *) +- lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" +- ;; +-esac +- +-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_cv_prog_compiler_c_o_GCJ=no +- $rm -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- +- lt_compiler_flag="-o out/conftest2.$ac_objext" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ +- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ +- -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16785: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&5 +- echo "$as_me:16789: \$? = $ac_status" >&5 +- if (exit $ac_status) && test -s out/conftest2.$ac_objext +- then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- if test ! -s out/conftest.err; then +- lt_cv_prog_compiler_c_o_GCJ=yes +- fi +- fi +- chmod u+w . +- $rm conftest* +- # SGI C++ compiler will create directory out/ii_files/ for +- # template instantiation +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out +- cd .. +- rmdir conftest +- $rm conftest* +- +-fi +-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 +- +- +-hard_links="nottested" +-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then +- # do not overwrite the value of need_locks provided by the user +- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 +- hard_links=yes +- $rm conftest* +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- touch conftest.a +- ln conftest.a conftest.b 2>&5 || hard_links=no +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- echo "$as_me:$LINENO: result: $hard_links" >&5 +-echo "${ECHO_T}$hard_links" >&6 +- if test "$hard_links" = no; then +- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} +- need_locks=warn +- fi +-else +- need_locks=no +-fi +- +-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +- +- runpath_var= +- allow_undefined_flag_GCJ= +- enable_shared_with_static_runtimes_GCJ=no +- archive_cmds_GCJ= +- archive_expsym_cmds_GCJ= +- old_archive_From_new_cmds_GCJ= +- old_archive_from_expsyms_cmds_GCJ= +- export_dynamic_flag_spec_GCJ= +- whole_archive_flag_spec_GCJ= +- thread_safe_flag_spec_GCJ= +- hardcode_libdir_flag_spec_GCJ= +- hardcode_libdir_flag_spec_ld_GCJ= +- hardcode_libdir_separator_GCJ= +- hardcode_direct_GCJ=no +- hardcode_minus_L_GCJ=no +- hardcode_shlibpath_var_GCJ=unsupported +- link_all_deplibs_GCJ=unknown +- hardcode_automatic_GCJ=no +- module_cmds_GCJ= +- module_expsym_cmds_GCJ= +- always_export_symbols_GCJ=no +- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- # include_expsyms should be a list of space-separated symbols to be *always* +- # included in the symbol list +- include_expsyms_GCJ= +- # exclude_expsyms can be an extended regexp of symbols to exclude +- # it will be wrapped by ` (' and `)$', so one must not match beginning or +- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', +- # as well as any symbol that contains `d'. +- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" +- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out +- # platforms (ab)use it in PIC code, but their linkers get confused if +- # the symbol is explicitly referenced. Since portable code cannot +- # rely on this symbol name, it's probably fine to never include it in +- # preloaded symbol tables. +- extract_expsyms_cmds= +- +- case $host_os in +- cygwin* | mingw* | pw32*) +- # FIXME: the MSVC++ port hasn't been tested in a loooong time +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- if test "$GCC" != yes; then +- with_gnu_ld=no +- fi +- ;; +- openbsd*) +- with_gnu_ld=no +- ;; +- esac +- +- ld_shlibs_GCJ=yes +- if test "$with_gnu_ld" = yes; then +- # If archive_cmds runs LD, not CC, wlarc should be empty +- wlarc='${wl}' +- +- # See if GNU ld supports shared libraries. +- case $host_os in +- aix3* | aix4* | aix5*) +- # On AIX/PPC, the GNU linker is very broken +- if test "$host_cpu" != ia64; then +- ld_shlibs_GCJ=no +- cat <&2 +- +-*** Warning: the GNU linker, at least up to release 2.9.1, is reported +-*** to be unable to reliably create shared libraries on AIX. +-*** Therefore, libtool is disabling shared libraries support. If you +-*** really care for shared libraries, you may want to modify your PATH +-*** so that a non-GNU linker is found, and then restart. +- +-EOF +- fi +- ;; +- +- amigaos*) +- archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_minus_L_GCJ=yes +- +- # Samuel A. Falvo II reports +- # that the semantics of dynamic libraries on AmigaOS, at least up +- # to version 4, is to share data among multiple programs linked +- # with the same dynamic library. Since this doesn't match the +- # behavior of shared libraries on other platforms, we can't use +- # them. +- ld_shlibs_GCJ=no +- ;; +- +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- allow_undefined_flag_GCJ=unsupported +- # Joseph Beckenbach says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- ld_shlibs_GCJ=no +- fi +- ;; +- +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, +- # as there is no search path for DLLs. +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- allow_undefined_flag_GCJ=unsupported +- always_export_symbols_GCJ=no +- enable_shared_with_static_runtimes_GCJ=yes +- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' +- +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' +- else +- ld_shlibs=no +- fi +- ;; +- +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' +- wlarc= +- else +- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- fi +- ;; +- +- solaris* | sysv5*) +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then +- ld_shlibs_GCJ=no +- cat <&2 +- +-*** Warning: The releases 2.8.* of the GNU linker cannot reliably +-*** create shared libraries on Solaris systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.9.1 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. +- +-EOF +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- ld_shlibs_GCJ=no +- fi +- ;; +- +- sunos4*) +- archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- wlarc= +- hardcode_direct_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- ;; +- +- linux*) +- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then +- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_cmds_GCJ="$tmp_archive_cmds" +- supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in +- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac +- if test $supports_anon_versioning = yes; then +- archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ +-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +-$echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- else +- archive_expsym_cmds_GCJ="$tmp_archive_cmds" +- fi +- else +- ld_shlibs_GCJ=no +- fi +- ;; +- +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- ld_shlibs_GCJ=no +- fi +- ;; +- esac +- +- if test "$ld_shlibs_GCJ" = yes; then +- runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' +- export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' +- # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +- whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- whole_archive_flag_spec_GCJ= +- fi +- fi +- else +- # PORTME fill in a description of your system's linker (not GNU ld) +- case $host_os in +- aix3*) +- allow_undefined_flag_GCJ=unsupported +- always_export_symbols_GCJ=yes +- archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' +- # Note: this linker hardcodes the directories in LIBPATH if there +- # are no directories specified by -L. +- hardcode_minus_L_GCJ=yes +- if test "$GCC" = yes && test -z "$link_static_flag"; then +- # Neither direct hardcoding nor static linking is supported with a +- # broken collect2. +- hardcode_direct_GCJ=unsupported +- fi +- ;; +- +- aix4* | aix5*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- # If we're using GNU nm, then we don't want the "-C" option. +- # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' +- else +- export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' +- fi +- aix_use_runtimelinking=no +- +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) +- for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi +- done +- esac +- +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi +- +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +- +- archive_cmds_GCJ='' +- hardcode_direct_GCJ=yes +- hardcode_libdir_separator_GCJ=':' +- link_all_deplibs_GCJ=yes +- +- if test "$GCC" = yes; then +- case $host_os in aix4.012|aix4.012.*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- hardcode_direct_GCJ=yes +- else +- # We have old collect2 +- hardcode_direct_GCJ=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- hardcode_minus_L_GCJ=yes +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_libdir_separator_GCJ= +- fi +- esac +- shared_flag='-shared' +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi +- +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- always_export_symbols_GCJ=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- allow_undefined_flag_GCJ='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +- +- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" +- archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' +- allow_undefined_flag_GCJ="-z nodefs" +- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'`; fi +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +- +- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- no_undefined_flag_GCJ=' ${wl}-bernotok' +- allow_undefined_flag_GCJ=' ${wl}-berok' +- # -bexpall does not export symbols beginning with underscore (_) +- always_export_symbols_GCJ=yes +- # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec_GCJ=' ' +- archive_cmds_need_lc_GCJ=yes +- # This is similar to how AIX traditionally builds it's shared libraries. +- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; +- +- amigaos*) +- archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_minus_L_GCJ=yes +- # see comment about different semantics on the GNU ld section +- ld_shlibs_GCJ=no +- ;; +- +- bsdi4*) +- export_dynamic_flag_spec_GCJ=-rdynamic +- ;; +- +- cygwin* | mingw* | pw32*) +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- # hardcode_libdir_flag_spec is actually meaningless, as there is +- # no search path for DLLs. +- hardcode_libdir_flag_spec_GCJ=' ' +- allow_undefined_flag_GCJ=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext=".dll" +- # FIXME: Setting linknames here is a bad hack. +- archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- old_archive_From_new_cmds_GCJ='true' +- # FIXME: Should let the user specify the lib program. +- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes_GCJ=yes +- ;; +- +- darwin* | rhapsody*) +- if test "$GXX" = yes ; then +- archive_cmds_need_lc_GCJ=no +- case "$host_os" in +- rhapsody* | darwin1.[012]) +- allow_undefined_flag_GCJ='-undefined suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' +- ;; +- 10.*) +- allow_undefined_flag_GCJ='-undefined dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- lt_int_apple_cc_single_mod=no +- output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes +- fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- hardcode_direct_GCJ=no +- hardcode_automatic_GCJ=yes +- hardcode_shlibpath_var_GCJ=unsupported +- whole_archive_flag_spec_GCJ='-all_load $convenience' +- link_all_deplibs_GCJ=yes +- else +- ld_shlibs_GCJ=no +- fi +- ;; +- +- dgux*) +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_shlibpath_var_GCJ=no +- ;; +- +- freebsd1*) +- ld_shlibs_GCJ=no +- ;; +- +- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor +- # support. Future versions do this automatically, but an explicit c++rt0.o +- # does not break anything, and helps significantly (at the cost of a little +- # extra space). +- freebsd2.2*) +- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- hardcode_libdir_flag_spec_GCJ='-R$libdir' +- hardcode_direct_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- ;; +- +- # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) +- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_GCJ=yes +- hardcode_minus_L_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- ;; +- +- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | kfreebsd*-gnu) +- archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_GCJ='-R$libdir' +- hardcode_direct_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- ;; +- +- hpux9*) +- if test "$GCC" = yes; then +- archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- fi +- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_GCJ=: +- hardcode_direct_GCJ=yes +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L_GCJ=yes +- export_dynamic_flag_spec_GCJ='${wl}-E' +- ;; +- +- hpux10* | hpux11*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*|ia64*) +- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- else +- case "$host_cpu" in +- hppa*64*|ia64*) +- archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' +- ;; +- *) +- archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +- ;; +- esac +- fi +- if test "$with_gnu_ld" = no; then +- case "$host_cpu" in +- hppa*64*) +- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' +- hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' +- hardcode_libdir_separator_GCJ=: +- hardcode_direct_GCJ=no +- hardcode_shlibpath_var_GCJ=no +- ;; +- ia64*) +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_direct_GCJ=no +- hardcode_shlibpath_var_GCJ=no +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L_GCJ=yes +- ;; +- *) +- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_GCJ=: +- hardcode_direct_GCJ=yes +- export_dynamic_flag_spec_GCJ='${wl}-E' +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L_GCJ=yes +- ;; +- esac +- fi +- ;; +- +- irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' +- fi +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_GCJ=: +- link_all_deplibs_GCJ=yes +- ;; +- +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out +- else +- archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF +- fi +- hardcode_libdir_flag_spec_GCJ='-R$libdir' +- hardcode_direct_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- ;; +- +- newsos6) +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_GCJ=yes +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_GCJ=: +- hardcode_shlibpath_var_GCJ=no +- ;; +- +- openbsd*) +- hardcode_direct_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_GCJ='${wl}-E' +- else +- case $host_os in +- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) +- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_GCJ='-R$libdir' +- ;; +- *) +- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' +- ;; +- esac +- fi +- ;; +- +- os2*) +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_minus_L_GCJ=yes +- allow_undefined_flag_GCJ=unsupported +- archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +- old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' +- ;; +- +- osf3*) +- if test "$GCC" = yes; then +- allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- allow_undefined_flag_GCJ=' -expect_unresolved \*' +- archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- fi +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_GCJ=: +- ;; +- +- osf4* | osf5*) # as osf3* with the addition of -msym flag +- if test "$GCC" = yes; then +- allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' +- else +- allow_undefined_flag_GCJ=' -expect_unresolved \*' +- archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' +- +- # Both c and cxx compiler support -rpath directly +- hardcode_libdir_flag_spec_GCJ='-rpath $libdir' +- fi +- hardcode_libdir_separator_GCJ=: +- ;; +- +- sco3.2v5*) +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var_GCJ=no +- export_dynamic_flag_spec_GCJ='${wl}-Bexport' +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- ;; +- +- solaris*) +- no_undefined_flag_GCJ=' -z text' +- if test "$GCC" = yes; then +- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' +- else +- archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' +- fi +- hardcode_libdir_flag_spec_GCJ='-R$libdir' +- hardcode_shlibpath_var_GCJ=no +- case $host_os in +- solaris2.[0-5] | solaris2.[0-5].*) ;; +- *) # Supported since Solaris 2.6 (maybe 2.5.1?) +- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; +- esac +- link_all_deplibs_GCJ=yes +- ;; +- +- sunos4*) +- if test "x$host_vendor" = xsequent; then +- # Use $CC to link under sequent, because it throws in some extra .o +- # files that make .init and .fini sections work. +- archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' +- fi +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_direct_GCJ=yes +- hardcode_minus_L_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- ;; +- +- sysv4) +- case $host_vendor in +- sni) +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_GCJ=yes # is this really true??? +- ;; +- siemens) +- ## LD is ld it makes a PLAMLIB +- ## CC just makes a GrossModule. +- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- reload_cmds_GCJ='$CC -r -o $output$reload_objs' +- hardcode_direct_GCJ=no +- ;; +- motorola) +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie +- ;; +- esac +- runpath_var='LD_RUN_PATH' +- hardcode_shlibpath_var_GCJ=no +- ;; +- +- sysv4.3*) +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var_GCJ=no +- export_dynamic_flag_spec_GCJ='-Bexport' +- ;; +- +- sysv4*MP*) +- if test -d /usr/nec; then +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var_GCJ=no +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- ld_shlibs_GCJ=yes +- fi +- ;; +- +- sysv4.2uw2*) +- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_GCJ=yes +- hardcode_minus_L_GCJ=no +- hardcode_shlibpath_var_GCJ=no +- hardcode_runpath_var=yes +- runpath_var=LD_RUN_PATH +- ;; +- +- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) +- no_undefined_flag_GCJ='${wl}-z ${wl}text' +- if test "$GCC" = yes; then +- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- runpath_var='LD_RUN_PATH' +- hardcode_shlibpath_var_GCJ=no +- ;; +- +- sysv5*) +- no_undefined_flag_GCJ=' -z text' +- # $CC -shared without GNU ld will not create a library from C++ +- # object files and a static libstdc++, better avoid it by now +- archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' +- hardcode_libdir_flag_spec_GCJ= +- hardcode_shlibpath_var_GCJ=no +- runpath_var='LD_RUN_PATH' +- ;; +- +- uts4*) +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_shlibpath_var_GCJ=no +- ;; +- +- *) +- ld_shlibs_GCJ=no +- ;; +- esac +- fi +- +-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +-echo "${ECHO_T}$ld_shlibs_GCJ" >&6 +-test "$ld_shlibs_GCJ" = no && can_build_shared=no +- +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi +- +-# +-# Do we need to explicitly link libc? +-# +-case "x$archive_cmds_need_lc_GCJ" in +-x|xyes) +- # Assume -lc should be added +- archive_cmds_need_lc_GCJ=yes +- +- if test "$enable_shared" = yes && test "$GCC" = yes; then +- case $archive_cmds_GCJ in +- *'~'*) +- # FIXME: we may have to deal with multi-command sequences. +- ;; +- '$CC '*) +- # Test whether the compiler implicitly links with -lc since on some +- # systems, -lgcc has to come before -lc. If gcc already passes -lc +- # to ld, don't add -lc before -lgcc. +- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 +- $rm conftest* +- printf "$lt_simple_compile_test_code" > conftest.$ac_ext +- +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } 2>conftest.err; then +- soname=conftest +- lib=conftest +- libobjs=conftest.$ac_objext +- deplibs= +- wl=$lt_prog_compiler_wl_GCJ +- compiler_flags=-v +- linker_flags=-v +- verstring= +- output_objdir=. +- libname=conftest +- lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ +- allow_undefined_flag_GCJ= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 +- (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +- then +- archive_cmds_need_lc_GCJ=no +- else +- archive_cmds_need_lc_GCJ=yes +- fi +- allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag +- else +- cat conftest.err 1>&5 +- fi +- $rm conftest* +- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 +- ;; +- esac +- fi +- ;; +-esac +- +-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +-library_names_spec= +-libname_spec='lib$name' +-soname_spec= +-shrext=".so" +-postinstall_cmds= +-postuninstall_cmds= +-finish_cmds= +-finish_eval= +-shlibpath_var= +-shlibpath_overrides_runpath=unknown +-version_type=none +-dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" +-if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then +- # if the path contains ";" then we assume it to be the separator +- # otherwise default to the standard path separator (i.e. ":") - it is +- # assumed that no part of a normal pathname contains ";" but that should +- # okay in the real world where ";" in dirpaths is itself problematic. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +-else +- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +-fi +-need_lib_prefix=unknown +-hardcode_into_libs=no +- +-# when you set need_version to no, make sure it does not cause -set_version +-# flags to be left without arguments +-need_version=unknown +- +-case $host_os in +-aix3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' +- shlibpath_var=LIBPATH +- +- # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- +-aix4* | aix5*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- hardcode_into_libs=yes +- if test "$host_cpu" = ia64; then +- # AIX 5 supports IA64 +- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- else +- # With GCC up to 2.95.x, collect2 would create an import file +- # for dependence libraries. The import file would start with +- # the line `#! .'. This would cause the generated library to +- # depend on `.', always an invalid library. This was fixed in +- # development snapshots of GCC prior to 3.0. +- case $host_os in +- aix4 | aix4.[01] | aix4.[01].*) +- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' +- echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then +- : +- else +- can_build_shared=no +- fi +- ;; +- esac +- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct +- # soname into executable. Probably we can add versioning support to +- # collect2, so additional links can be useful in future. +- if test "$aix_use_runtimelinking" = yes; then +- # If using run time linking (on AIX 4.2 or later) use lib.so +- # instead of lib.a to let people know that these are not +- # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- else +- # We preserve .a as extension for shared libraries through AIX4.2 +- # and later when we are not doing run time linking. +- library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' +- fi +- shlibpath_var=LIBPATH +- fi +- ;; +- +-amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' +- ;; +- +-beos*) +- library_names_spec='${libname}${shared_ext}' +- dynamic_linker="$host_os ld.so" +- shlibpath_var=LIBRARY_PATH +- ;; +- +-bsdi4*) +- version_type=linux +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" +- # the default ld.so.conf also contains /usr/contrib/lib and +- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow +- # libtool to hard-code these into programs +- ;; +- +-cygwin* | mingw* | pw32*) +- version_type=windows +- shrext=".dll" +- need_version=no +- need_lib_prefix=no +- +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) +- library_names_spec='$libname.dll.a' +- # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ +- dldir=$destdir/`dirname \$dlpath`~ +- test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname' +- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ +- dlpath=$dir/\$dldll~ +- $rm \$dlpath' +- shlibpath_overrides_runpath=yes +- +- case $host_os in +- cygwin*) +- # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +- ;; +- mingw*) +- # MinGW DLLs use traditional 'lib' prefix +- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then +- # It is most probably a Windows format PATH printed by +- # mingw gcc, but we are running on Cygwin. Gcc prints its search +- # path with ; separators, and with drive letters. We can handle the +- # drive letters (cygwin fileutils understands them), so leave them, +- # especially as we might pass files found there to a mingw objdump, +- # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi +- ;; +- pw32*) +- # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' +- ;; +- esac +- ;; +- +- *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' +- ;; +- esac +- dynamic_linker='Win32 ld.exe' +- # FIXME: first we should search . and the directory the executable is in +- shlibpath_var=PATH +- ;; +- +-darwin* | rhapsody*) +- dynamic_linker="$host_os dyld" +- version_type=darwin +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' +- shlibpath_overrides_runpath=yes +- shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' +- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. +- if test "$GCC" = yes; then +- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +- else +- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' +- fi +- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' +- ;; +- +-dgux*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- ;; +- +-freebsd1*) +- dynamic_linker=no +- ;; +- +-kfreebsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- +-freebsd*) +- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +- version_type=freebsd-$objformat +- case $version_type in +- freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- need_version=no +- need_lib_prefix=no +- ;; +- freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' +- need_version=yes +- ;; +- esac +- shlibpath_var=LD_LIBRARY_PATH +- case $host_os in +- freebsd2*) +- shlibpath_overrides_runpath=yes +- ;; +- freebsd3.01* | freebsdelf3.01*) +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- *) # from 3.2 on +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- esac +- ;; +- +-gnu*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- hardcode_into_libs=yes +- ;; +- +-hpux9* | hpux10* | hpux11*) +- # Give a soname corresponding to the major version so that dld.sl refuses to +- # link against other versions. +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- case "$host_cpu" in +- ia64*) +- shrext='.so' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.so" +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- if test "X$HPUX_IA64_MODE" = X32; then +- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" +- else +- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" +- fi +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- hppa*64*) +- shrext='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext='.sl' +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=SHLIB_PATH +- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555. +- postinstall_cmds='chmod 555 $lib' +- ;; +- +-irix5* | irix6* | nonstopux*) +- case $host_os in +- nonstopux*) version_type=nonstopux ;; +- *) +- if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux +- else +- version_type=irix +- fi ;; +- esac +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' +- case $host_os in +- irix5* | nonstopux*) +- libsuff= shlibsuff= +- ;; +- *) +- case $LD in # libtool.m4 will add one of these switches to LD +- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") +- libsuff= shlibsuff= libmagic=32-bit;; +- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") +- libsuff=32 shlibsuff=N32 libmagic=N32;; +- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") +- libsuff=64 shlibsuff=64 libmagic=64-bit;; +- *) libsuff= shlibsuff= libmagic=never-match;; +- esac +- ;; +- esac +- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" +- hardcode_into_libs=yes +- ;; +- +-# No shared lib support for Linux oldld, aout, or coff. +-linux*oldld* | linux*aout* | linux*coff*) +- dynamic_linker=no +- ;; +- +-# This must be Linux ELF. +-linux*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- # This implies no fast_install, which is unacceptable. +- # Some rework will be needed to allow for fast_install +- # before this can be enabled. +- hardcode_into_libs=yes +- +- # Append ld.so.conf contents to the search path +- if test -f /etc/ld.so.conf; then +- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra" +- fi +- +- # We used to test for /lib/ld.so.1 and disable shared libraries on +- # powerpc, because MkLinux only supported shared libraries with the +- # GNU dynamic linker. Since this was broken with cross compilers, +- # most powerpc-linux boxes support dynamic linking these days and +- # people can always --disable-shared, the test was removed, and we +- # assume the GNU/Linux dynamic linker is in use. +- dynamic_linker='GNU/Linux ld.so' +- ;; +- +-knetbsd*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='GNU ld.so' +- ;; +- +-netbsd*) +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- dynamic_linker='NetBSD (a.out) ld.so' +- else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='NetBSD ld.elf_so' +- fi +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- +-newsos6) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; +- +-nto-qnx*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; +- +-openbsd*) +- version_type=sunos +- need_lib_prefix=no +- need_version=yes +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- case $host_os in +- openbsd2.[89] | openbsd2.[89].*) +- shlibpath_overrides_runpath=no +- ;; +- *) +- shlibpath_overrides_runpath=yes +- ;; +- esac +- else +- shlibpath_overrides_runpath=yes +- fi +- ;; +- +-os2*) +- libname_spec='$name' +- shrext=".dll" +- need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' +- dynamic_linker='OS/2 ld.exe' +- shlibpath_var=LIBPATH +- ;; +- +-osf3* | osf4* | osf5*) +- version_type=osf +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" +- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" +- ;; +- +-sco3.2v5*) +- version_type=osf +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- ;; +- +-solaris*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- # ldd complains unless libraries are executable +- postinstall_cmds='chmod +x $lib' +- ;; +- +-sunos4*) +- version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- fi +- need_version=yes +- ;; +- +-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- case $host_vendor in +- sni) +- shlibpath_overrides_runpath=no +- need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' +- runpath_var=LD_RUN_PATH +- ;; +- siemens) +- need_lib_prefix=no +- ;; +- motorola) +- need_lib_prefix=no +- need_version=no +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' +- ;; +- esac +- ;; +- +-sysv4*MP*) +- if test -d /usr/nec ;then +- version_type=linux +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' +- shlibpath_var=LD_LIBRARY_PATH +- fi +- ;; +- +-uts4*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- ;; +- +-*) +- dynamic_linker=no +- ;; +-esac +-echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-echo "${ECHO_T}$dynamic_linker" >&6 +-test "$dynamic_linker" = no && can_build_shared=no +- +-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +-hardcode_action_GCJ= +-if test -n "$hardcode_libdir_flag_spec_GCJ" || \ +- test -n "$runpath_var GCJ" || \ +- test "X$hardcode_automatic_GCJ"="Xyes" ; then +- +- # We can hardcode non-existant directories. +- if test "$hardcode_direct_GCJ" != no && +- # If the only mechanism to avoid hardcoding is shlibpath_var, we +- # have to relink, otherwise we might link with an installed library +- # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && +- test "$hardcode_minus_L_GCJ" != no; then +- # Linking always hardcodes the temporary library directory. +- hardcode_action_GCJ=relink +- else +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- hardcode_action_GCJ=immediate +- fi +-else +- # We cannot hardcode anything, or else we can only hardcode existing +- # directories. +- hardcode_action_GCJ=unsupported +-fi +-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +-echo "${ECHO_T}$hardcode_action_GCJ" >&6 +- +-if test "$hardcode_action_GCJ" = relink; then +- # Fast installation is not supported +- enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then +- # Fast installation is not necessary +- enable_fast_install=needless +-fi +- +-striplib= +-old_striplib= +-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then +- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" +- test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +-else +-# FIXME - insert some real tests, host_os isn't really good enough +- case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- ;; +- *) +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +- ;; +- esac +-fi +- +-if test "x$enable_dlopen" != xyes; then +- enable_dlopen=unknown +- enable_dlopen_self=unknown +- enable_dlopen_self_static=unknown +-else +- lt_cv_dlopen=no +- lt_cv_dlopen_libs= +- +- case $host_os in +- beos*) +- lt_cv_dlopen="load_add_on" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ;; +- +- mingw* | pw32*) +- lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= +- ;; +- +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; +- +- darwin*) +- # if libdl is installed we need to link against it +- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-int +-main () +-{ +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dl_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dl_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +-if test $ac_cv_lib_dl_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- +- lt_cv_dlopen="dyld" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- +-fi +- +- ;; +- +- *) +- echo "$as_me:$LINENO: checking for shl_load" >&5 +-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 +-if test "${ac_cv_func_shl_load+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define shl_load to an innocuous variant, in case declares shl_load. +- For example, HP-UX 11i declares gettimeofday. */ +-#define shl_load innocuous_shl_load +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shl_load (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef shl_load +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char shl_load (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_shl_load) || defined (__stub___shl_load) +-choke me +-#else +-char (*f) () = shl_load; +-#endif +-#ifdef __cplusplus +-} +-#endif +- +-int +-main () +-{ +-return f != shl_load; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_shl_load=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_func_shl_load=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +-if test $ac_cv_func_shl_load = yes; then +- lt_cv_dlopen="shl_load" +-else +- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 +-if test "${ac_cv_lib_dld_shl_load+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char shl_load (); +-int +-main () +-{ +-shl_load (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dld_shl_load=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dld_shl_load=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +-if test $ac_cv_lib_dld_shl_load = yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" +-else +- echo "$as_me:$LINENO: checking for dlopen" >&5 +-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 +-if test "${ac_cv_func_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define dlopen to an innocuous variant, in case declares dlopen. +- For example, HP-UX 11i declares gettimeofday. */ +-#define dlopen innocuous_dlopen +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char dlopen (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef dlopen +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_dlopen) || defined (__stub___dlopen) +-choke me +-#else +-char (*f) () = dlopen; +-#endif +-#ifdef __cplusplus +-} +-#endif +- +-int +-main () +-{ +-return f != dlopen; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_func_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +-if test $ac_cv_func_dlopen = yes; then +- lt_cv_dlopen="dlopen" +-else +- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-int +-main () +-{ +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dl_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dl_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +-if test $ac_cv_lib_dl_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 +-if test "${ac_cv_lib_svld_dlopen+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lsvld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dlopen (); +-int +-main () +-{ +-dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_svld_dlopen=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_svld_dlopen=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +-if test $ac_cv_lib_svld_dlopen = yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +-else +- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 +-if test "${ac_cv_lib_dld_dld_link+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dld_link (); +-int +-main () +-{ +-dld_link (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_dld_dld_link=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dld_dld_link=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +-if test $ac_cv_lib_dld_dld_link = yes; then +- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" +-fi +- +- +-fi +- +- +-fi +- +- +-fi +- +- +-fi +- +- +-fi +- +- ;; +- esac +- +- if test "x$lt_cv_dlopen" != xno; then +- enable_dlopen=yes +- else +- enable_dlopen=no +- fi +- +- case $lt_cv_dlopen in +- dlopen) +- save_CPPFLAGS="$CPPFLAGS" +- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" +- +- save_LDFLAGS="$LDFLAGS" +- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" +- +- save_LIBS="$LIBS" +- LIBS="$lt_cv_dlopen_libs $LIBS" +- +- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 +-if test "${lt_cv_dlopen_self+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test "$cross_compiling" = yes; then : +- lt_cv_dlopen_self=cross +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < +-#endif +- +-#include +- +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif +- +-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we +- find out it does not work in some platform. */ +-#ifndef LT_DLLAZY_OR_NOW +-# ifdef RTLD_LAZY +-# define LT_DLLAZY_OR_NOW RTLD_LAZY +-# else +-# ifdef DL_LAZY +-# define LT_DLLAZY_OR_NOW DL_LAZY +-# else +-# ifdef RTLD_NOW +-# define LT_DLLAZY_OR_NOW RTLD_NOW +-# else +-# ifdef DL_NOW +-# define LT_DLLAZY_OR_NOW DL_NOW +-# else +-# define LT_DLLAZY_OR_NOW 0 +-# endif +-# endif +-# endif +-# endif +-#endif +- +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; +- +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } +- +- exit (status); +-} +-EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; +- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; +- x$lt_unknown|x*) lt_cv_dlopen_self=no ;; +- esac +- else : +- # compilation failed +- lt_cv_dlopen_self=no +- fi +-fi +-rm -fr conftest* +- +- +-fi +-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +- +- if test "x$lt_cv_dlopen_self" = xyes; then +- LDFLAGS="$LDFLAGS $link_static_flag" +- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 +-if test "${lt_cv_dlopen_self_static+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test "$cross_compiling" = yes; then : +- lt_cv_dlopen_self_static=cross +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext < +-#endif +- +-#include +- +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif +- +-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we +- find out it does not work in some platform. */ +-#ifndef LT_DLLAZY_OR_NOW +-# ifdef RTLD_LAZY +-# define LT_DLLAZY_OR_NOW RTLD_LAZY +-# else +-# ifdef DL_LAZY +-# define LT_DLLAZY_OR_NOW DL_LAZY +-# else +-# ifdef RTLD_NOW +-# define LT_DLLAZY_OR_NOW RTLD_NOW +-# else +-# ifdef DL_NOW +-# define LT_DLLAZY_OR_NOW DL_NOW +-# else +-# define LT_DLLAZY_OR_NOW 0 +-# endif +-# endif +-# endif +-# endif +-#endif +- +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; +- +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } +- +- exit (status); +-} +-EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; +- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; +- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;; +- esac +- else : +- # compilation failed +- lt_cv_dlopen_self_static=no +- fi +-fi +-rm -fr conftest* +- +- +-fi +-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +- fi +- +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" +- ;; +- esac +- +- case $lt_cv_dlopen_self in +- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; +- *) enable_dlopen_self=unknown ;; +- esac +- +- case $lt_cv_dlopen_self_static in +- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; +- *) enable_dlopen_self_static=unknown ;; +- esac +-fi +- +- +-# The else clause should only fire when bootstrapping the +-# libtool distribution, otherwise you forgot to ship ltmain.sh +-# with your package, and you will get complaints that there are +-# no rules to generate ltmain.sh. +-if test -f "$ltmain"; then +- # See if we are running on zsh, and set the options which allow our commands through +- # without removal of \ escapes. +- if test -n "${ZSH_VERSION+set}" ; then +- setopt NO_GLOB_SUBST +- fi +- # Now quote all the things that may contain metacharacters while being +- # careful not to overquote the AC_SUBSTed values. We take copies of the +- # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \ +- SED SHELL STRIP \ +- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ +- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ +- deplibs_check_method reload_flag reload_cmds need_locks \ +- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ +- lt_cv_sys_global_symbol_to_c_name_address \ +- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ +- old_postinstall_cmds old_postuninstall_cmds \ +- compiler_GCJ \ +- CC_GCJ \ +- LD_GCJ \ +- lt_prog_compiler_wl_GCJ \ +- lt_prog_compiler_pic_GCJ \ +- lt_prog_compiler_static_GCJ \ +- lt_prog_compiler_no_builtin_flag_GCJ \ +- export_dynamic_flag_spec_GCJ \ +- thread_safe_flag_spec_GCJ \ +- whole_archive_flag_spec_GCJ \ +- enable_shared_with_static_runtimes_GCJ \ +- old_archive_cmds_GCJ \ +- old_archive_from_new_cmds_GCJ \ +- predep_objects_GCJ \ +- postdep_objects_GCJ \ +- predeps_GCJ \ +- postdeps_GCJ \ +- compiler_lib_search_path_GCJ \ +- archive_cmds_GCJ \ +- archive_expsym_cmds_GCJ \ +- postinstall_cmds_GCJ \ +- postuninstall_cmds_GCJ \ +- old_archive_from_expsyms_cmds_GCJ \ +- allow_undefined_flag_GCJ \ +- no_undefined_flag_GCJ \ +- export_symbols_cmds_GCJ \ +- hardcode_libdir_flag_spec_GCJ \ +- hardcode_libdir_flag_spec_ld_GCJ \ +- hardcode_libdir_separator_GCJ \ +- hardcode_automatic_GCJ \ +- module_cmds_GCJ \ +- module_expsym_cmds_GCJ \ +- lt_cv_prog_compiler_c_o_GCJ \ +- exclude_expsyms_GCJ \ +- include_expsyms_GCJ; do +- +- case $var in +- old_archive_cmds_GCJ | \ +- old_archive_from_new_cmds_GCJ | \ +- archive_cmds_GCJ | \ +- archive_expsym_cmds_GCJ | \ +- module_cmds_GCJ | \ +- module_expsym_cmds_GCJ | \ +- old_archive_from_expsyms_cmds_GCJ | \ +- export_symbols_cmds_GCJ | \ +- extract_expsyms_cmds | reload_cmds | finish_cmds | \ +- postinstall_cmds | postuninstall_cmds | \ +- old_postinstall_cmds | old_postuninstall_cmds | \ +- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) +- # Double-quote double-evaled strings. +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" +- ;; +- *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" +- ;; +- esac +- done +- +- case $lt_echo in +- *'\$0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` +- ;; +- esac +- +-cfgfile="$ofile" +- +- cat <<__EOF__ >> "$cfgfile" +-# ### BEGIN LIBTOOL TAG CONFIG: $tagname +- +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +- +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL +- +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared +- +-# Whether or not to build static libraries. +-build_old_libs=$enable_static +- +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc_GCJ +- +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ +- +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install +- +-# The host system. +-host_alias=$host_alias +-host=$host +- +-# An echo program that does not interpret backslashes. +-echo=$lt_echo +- +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS +- +-# A C compiler. +-LTCC=$lt_LTCC +- +-# A language-specific compiler. +-CC=$lt_compiler_GCJ +- +-# Is the compiler the GNU C compiler? +-with_gcc=$GCC_GCJ +- +-# An ERE matcher. +-EGREP=$lt_EGREP +- +-# The linker used to build libraries. +-LD=$lt_LD_GCJ +- +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S +- +-# A BSD-compatible nm program. +-NM=$lt_NM +- +-# A symbol stripping program +-STRIP=$lt_STRIP +- +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD +- +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" +- +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" +- +-# Used on cygwin: assembler. +-AS=$lt_AS +- +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir +- +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +- +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl_GCJ +- +-# Object file suffix (normally "o"). +-objext="$ac_objext" +- +-# Old archive suffix (normally "a"). +-libext="$libext" +- +-# Shared library suffix (normally ".so"). +-shrext='$shrext' +- +-# Executable file suffix (normally ""). +-exeext="$exeext" +- +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic_GCJ +-pic_mode=$pic_mode +- +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len +- +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ +- +-# Must we lock files when doing compilation ? +-need_locks=$lt_need_locks +- +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix +- +-# Do we need a version for libraries? +-need_version=$need_version +- +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +- +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self +- +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static +- +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static_GCJ +- +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ +- +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ +- +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ +- +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ +- +-# Library versioning type. +-version_type=$version_type +- +-# Format of library name prefix. +-libname_spec=$lt_libname_spec +- +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec +- +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec +- +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_old_archive_cmds_GCJ +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds +- +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ +- +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ +- +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_archive_cmds_GCJ +-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds +- +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_module_cmds_GCJ +-module_expsym_cmds=$lt_module_expsym_cmds_GCJ +- +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_predep_objects_GCJ +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_postdep_objects_GCJ +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_predeps_GCJ +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_postdeps_GCJ +- +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ +- +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method +- +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd +- +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag_GCJ +- +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag_GCJ +- +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds +- +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval +- +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +- +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +- +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +- +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var +- +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var +- +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath +- +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action_GCJ +- +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs +- +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ +- +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ +- +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ +- +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$hardcode_direct_GCJ +- +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$hardcode_minus_L_GCJ +- +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ +- +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$hardcode_automatic_GCJ +- +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" +- +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs_GCJ +- +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +- +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +- +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_GCJ" +- +-# Set to yes if exported symbols are required. +-always_export_symbols=$always_export_symbols_GCJ +- +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds_GCJ +- +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds +- +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms_GCJ +- +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms_GCJ +- +-# ### END LIBTOOL TAG CONFIG: $tagname +- +-__EOF__ +- +- +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi +-fi +- +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-CC="$lt_save_CC" +- +- else +- tagname="" +- fi +- ;; +- +- RC) +- +- +- +-# Source file extension for RC test sources. +-ac_ext=rc +- +-# Object file extension for compiled RC test sources. +-objext=o +-objext_RC=$objext +- +-# Code to be used in simple compile tests +-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' +- +-# Code to be used in simple link tests +-lt_simple_link_test_code="$lt_simple_compile_test_code" +- +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +- +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} +- +-# Allow CC to be a program name with arguments. +-compiler=$CC +- +- +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${RC-"windres"} +-compiler=$CC +-compiler_RC=$CC +-lt_cv_prog_compiler_c_o_RC=yes +- +-# The else clause should only fire when bootstrapping the +-# libtool distribution, otherwise you forgot to ship ltmain.sh +-# with your package, and you will get complaints that there are +-# no rules to generate ltmain.sh. +-if test -f "$ltmain"; then +- # See if we are running on zsh, and set the options which allow our commands through +- # without removal of \ escapes. +- if test -n "${ZSH_VERSION+set}" ; then +- setopt NO_GLOB_SUBST +- fi +- # Now quote all the things that may contain metacharacters while being +- # careful not to overquote the AC_SUBSTed values. We take copies of the +- # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \ +- SED SHELL STRIP \ +- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ +- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ +- deplibs_check_method reload_flag reload_cmds need_locks \ +- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ +- lt_cv_sys_global_symbol_to_c_name_address \ +- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ +- old_postinstall_cmds old_postuninstall_cmds \ +- compiler_RC \ +- CC_RC \ +- LD_RC \ +- lt_prog_compiler_wl_RC \ +- lt_prog_compiler_pic_RC \ +- lt_prog_compiler_static_RC \ +- lt_prog_compiler_no_builtin_flag_RC \ +- export_dynamic_flag_spec_RC \ +- thread_safe_flag_spec_RC \ +- whole_archive_flag_spec_RC \ +- enable_shared_with_static_runtimes_RC \ +- old_archive_cmds_RC \ +- old_archive_from_new_cmds_RC \ +- predep_objects_RC \ +- postdep_objects_RC \ +- predeps_RC \ +- postdeps_RC \ +- compiler_lib_search_path_RC \ +- archive_cmds_RC \ +- archive_expsym_cmds_RC \ +- postinstall_cmds_RC \ +- postuninstall_cmds_RC \ +- old_archive_from_expsyms_cmds_RC \ +- allow_undefined_flag_RC \ +- no_undefined_flag_RC \ +- export_symbols_cmds_RC \ +- hardcode_libdir_flag_spec_RC \ +- hardcode_libdir_flag_spec_ld_RC \ +- hardcode_libdir_separator_RC \ +- hardcode_automatic_RC \ +- module_cmds_RC \ +- module_expsym_cmds_RC \ +- lt_cv_prog_compiler_c_o_RC \ +- exclude_expsyms_RC \ +- include_expsyms_RC; do +- +- case $var in +- old_archive_cmds_RC | \ +- old_archive_from_new_cmds_RC | \ +- archive_cmds_RC | \ +- archive_expsym_cmds_RC | \ +- module_cmds_RC | \ +- module_expsym_cmds_RC | \ +- old_archive_from_expsyms_cmds_RC | \ +- export_symbols_cmds_RC | \ +- extract_expsyms_cmds | reload_cmds | finish_cmds | \ +- postinstall_cmds | postuninstall_cmds | \ +- old_postinstall_cmds | old_postuninstall_cmds | \ +- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) +- # Double-quote double-evaled strings. +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" +- ;; +- *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" +- ;; +- esac +- done +- +- case $lt_echo in +- *'\$0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` +- ;; +- esac +- +-cfgfile="$ofile" +- +- cat <<__EOF__ >> "$cfgfile" +-# ### BEGIN LIBTOOL TAG CONFIG: $tagname +- +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +- +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL +- +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared +- +-# Whether or not to build static libraries. +-build_old_libs=$enable_static +- +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc_RC +- +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC +- +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install +- +-# The host system. +-host_alias=$host_alias +-host=$host +- +-# An echo program that does not interpret backslashes. +-echo=$lt_echo +- +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS +- +-# A C compiler. +-LTCC=$lt_LTCC +- +-# A language-specific compiler. +-CC=$lt_compiler_RC +- +-# Is the compiler the GNU C compiler? +-with_gcc=$GCC_RC +- +-# An ERE matcher. +-EGREP=$lt_EGREP +- +-# The linker used to build libraries. +-LD=$lt_LD_RC +- +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S +- +-# A BSD-compatible nm program. +-NM=$lt_NM +- +-# A symbol stripping program +-STRIP=$lt_STRIP +- +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD +- +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" +- +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" +- +-# Used on cygwin: assembler. +-AS=$lt_AS +- +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir +- +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +- +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl_RC +- +-# Object file suffix (normally "o"). +-objext="$ac_objext" +- +-# Old archive suffix (normally "a"). +-libext="$libext" +- +-# Shared library suffix (normally ".so"). +-shrext='$shrext' +- +-# Executable file suffix (normally ""). +-exeext="$exeext" +- +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic_RC +-pic_mode=$pic_mode +- +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len +- +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC +- +-# Must we lock files when doing compilation ? +-need_locks=$lt_need_locks +- +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix +- +-# Do we need a version for libraries? +-need_version=$need_version +- +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +- +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self +- +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static +- +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static_RC +- +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC +- +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC +- +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC +- +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC +- +-# Library versioning type. +-version_type=$version_type +- +-# Format of library name prefix. +-libname_spec=$lt_libname_spec +- +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec +- +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec +- +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_old_archive_cmds_RC +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds +- +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC +- +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC +- +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_archive_cmds_RC +-archive_expsym_cmds=$lt_archive_expsym_cmds_RC +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds +- +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_module_cmds_RC +-module_expsym_cmds=$lt_module_expsym_cmds_RC +- +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_predep_objects_RC +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_postdep_objects_RC +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_predeps_RC +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_postdeps_RC +- +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path_RC +- +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method +- +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd +- +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag_RC +- +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag_RC +- +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds +- +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval +- +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +- +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +- +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +- +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var +- +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var +- +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath +- +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action_RC +- +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs +- +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC +- +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC +- +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC +- +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$hardcode_direct_RC +- +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$hardcode_minus_L_RC +- +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC +- +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$hardcode_automatic_RC +- +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" +- +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs_RC +- +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +- +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +- +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path="$fix_srcfile_path_RC" +- +-# Set to yes if exported symbols are required. +-always_export_symbols=$always_export_symbols_RC +- +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds_RC +- +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds +- +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms_RC +- +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms_RC +- +-# ### END LIBTOOL TAG CONFIG: $tagname +- +-__EOF__ +- +- +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi +-fi +- +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-CC="$lt_save_CC" +- +- ;; +- +- *) +- { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 +-echo "$as_me: error: Unsupported tag name: $tagname" >&2;} +- { (exit 1); exit 1; }; } +- ;; +- esac +- +- # Append the new tag name to the list of available tags. +- if test -n "$tagname" ; then +- available_tags="$available_tags $tagname" +- fi +- fi +- done +- IFS="$lt_save_ifs" +- +- # Now substitute the updated list of available tags. +- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then +- mv "${ofile}T" "$ofile" +- chmod +x "$ofile" +- else +- rm -f "${ofile}T" +- { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 +-echo "$as_me: error: unable to update list of available tagged configurations." >&2;} +- { (exit 1); exit 1; }; } +- fi +-fi +- +- +- +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +- +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +- +-# Prevent multiple expansion +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-if test x"$enable_static$enable_all_static" = xnoyes; then +- { { echo "$as_me:$LINENO: error: You cannot pass --enable-all-static without one of --enable-static or --disable-shared" >&5 +-echo "$as_me: error: You cannot pass --enable-all-static without one of --enable-static or --disable-shared" >&2;} +- { (exit 1); exit 1; }; } +-fi +- +- +-if test $enable_static = yes; then +- CR_ENABLE_STATIC_TRUE= +- CR_ENABLE_STATIC_FALSE='#' +-else +- CR_ENABLE_STATIC_TRUE='#' +- CR_ENABLE_STATIC_FALSE= +-fi +- +- +- +-if test $enable_shared = yes; then +- CR_ENABLE_SHARED_TRUE= +- CR_ENABLE_SHARED_FALSE='#' +-else +- CR_ENABLE_SHARED_TRUE='#' +- CR_ENABLE_SHARED_FALSE= +-fi +- +- +-# Check for rpmbuild +- +- for ac_prog in rpmbuild rpmb rpm +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_RPMBUILD+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $RPMBUILD in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_RPMBUILD="$RPMBUILD" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-as_dummy="$PATH:/usr/lib/rpm" +-for as_dir in $as_dummy +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- ;; +-esac +-fi +-RPMBUILD=$ac_cv_path_RPMBUILD +- +-if test -n "$RPMBUILD"; then +- echo "$as_me:$LINENO: result: $RPMBUILD" >&5 +-echo "${ECHO_T}$RPMBUILD" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- test -n "$RPMBUILD" && break +-done +-test -n "$RPMBUILD" || RPMBUILD="none" +- +- if $RPMBUILD -bs 2>&1 | grep 'no spec' >/dev/null 2>/dev/null; then +- : +- else +- RPMBUILD=none +- fi +- +- +- +-if test $RPMBUILD != none; then +- HAVE_RPMBUILD_TRUE= +- HAVE_RPMBUILD_FALSE='#' +-else +- HAVE_RPMBUILD_TRUE='#' +- HAVE_RPMBUILD_FALSE= +-fi +- +- +-# Check for a GNU C compiler (or a work alike?) +- +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="${ac_tool_prefix}gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "gcc", so it can be a program name with args. +-set dummy gcc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="gcc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- CC=$ac_ct_CC +-else +- CC="$ac_cv_prog_CC" +-fi +- +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="${ac_tool_prefix}cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- CC=$ac_ct_CC +-else +- CC="$ac_cv_prog_CC" +-fi +- +-fi +-if test -z "$CC"; then +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_prog_rejected=no +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +- fi +- ac_cv_prog_CC="cc" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-if test $ac_prog_rejected = yes; then +- # We found a bogon in the path, so make sure we never use it. +- set dummy $ac_cv_prog_CC +- shift +- if test $# != 0; then +- # We chose a different compiler from the bogus one. +- # However, it has the same basename, so the bogon will be chosen +- # first if we set CC to just the basename; use the full file name. +- shift +- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" +- fi +-fi +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- for ac_prog in cl +- do +- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:$LINENO: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- test -n "$CC" && break +- done +-fi +-if test -z "$CC"; then +- ac_ct_CC=$CC +- for ac_prog in cl +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- test -n "$ac_ct_CC" && break +-done +- +- CC=$ac_ct_CC +-fi +- +-fi +- +- +-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +- +-# Provide some information about the compiler. +-echo "$as_me:$LINENO:" \ +- "checking for C compiler version" >&5 +-ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +- (eval $ac_compiler --version &5) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 +- (eval $ac_compiler -v &5) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 +- (eval $ac_compiler -V &5) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +- +-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +-if test "${ac_cv_c_compiler_gnu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +-#ifndef __GNUC__ +- choke me +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_compiler_gnu=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_compiler_gnu=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_cv_c_compiler_gnu=$ac_compiler_gnu +- +-fi +-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +-GCC=`test $ac_compiler_gnu = yes && echo yes` +-ac_test_CFLAGS=${CFLAGS+set} +-ac_save_CFLAGS=$CFLAGS +-CFLAGS="-g" +-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +-if test "${ac_cv_prog_cc_g+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_prog_cc_g=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_prog_cc_g=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +-if test "$ac_test_CFLAGS" = set; then +- CFLAGS=$ac_save_CFLAGS +-elif test $ac_cv_prog_cc_g = yes; then +- if test "$GCC" = yes; then +- CFLAGS="-g -O2" +- else +- CFLAGS="-g" +- fi +-else +- if test "$GCC" = yes; then +- CFLAGS="-O2" +- else +- CFLAGS= +- fi +-fi +-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +-if test "${ac_cv_prog_cc_stdc+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_prog_cc_stdc=no +-ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-#include +-#include +-#include +-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +-struct buf { int x; }; +-FILE * (*rcsopen) (struct buf *, struct stat *, int); +-static char *e (p, i) +- char **p; +- int i; +-{ +- return p[i]; +-} +-static char *f (char * (*g) (char **, int), char **p, ...) +-{ +- char *s; +- va_list v; +- va_start (v,p); +- s = g (p, va_arg (v,int)); +- va_end (v); +- return s; +-} +- +-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has +- function prototypes and stuff, but not '\xHH' hex character constants. +- These don't provoke an error unfortunately, instead are silently treated +- as 'x'. The following induces an error, until -std1 is added to get +- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an +- array size at least. It's necessary to write '\x00'==0 to get something +- that's true only with -std1. */ +-int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +- +-int test (int i, double x); +-struct s1 {int (*f) (int a);}; +-struct s2 {int (*f) (double a);}; +-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +-int argc; +-char **argv; +-int +-main () +-{ +-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +- ; +- return 0; +-} +-_ACEOF +-# Don't try gcc -ansi; that turns off useful extensions and +-# breaks some systems' header files. +-# AIX -qlanglvl=ansi +-# Ultrix and OSF/1 -std1 +-# HP-UX 10.20 and later -Ae +-# HP-UX older versions -Aa -D_HPUX_SOURCE +-# SVR4 -Xc -D__EXTENSIONS__ +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +-do +- CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_prog_cc_stdc=$ac_arg +-break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext +-done +-rm -f conftest.$ac_ext conftest.$ac_objext +-CC=$ac_save_CC +- +-fi +- +-case "x$ac_cv_prog_cc_stdc" in +- x|xno) +- echo "$as_me:$LINENO: result: none needed" >&5 +-echo "${ECHO_T}none needed" >&6 ;; +- *) +- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 +- CC="$CC $ac_cv_prog_cc_stdc" ;; +-esac +- +-# Some people use a C++ compiler to compile C. Since we use `exit', +-# in C++ we need to declare it. In case someone uses the same compiler +-# for both compiling C and C++ we need to have the C++ compiler decide +-# the declaration of exit, since it's the most demanding environment. +-cat >conftest.$ac_ext <<_ACEOF +-#ifndef __cplusplus +- choke me +-#endif +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- for ac_declaration in \ +- '' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_declaration +-#include +-int +-main () +-{ +-exit (42); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-continue +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_declaration +-int +-main () +-{ +-exit (42); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-rm -f conftest* +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-depcc="$CC" am_compiler_list= +- +-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +- +- am_cv_CC_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` +- fi +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +- +- case $depmode in +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break +- fi +- ;; +- none) break ;; +- esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. +- if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # (even with -Werror). So we grep stderr for any message +- # that says an option was ignored. +- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else +- am_cv_CC_dependencies_compiler_type=$depmode +- break +- fi +- fi +- done +- +- cd .. +- rm -rf conftest.dir +-else +- am_cv_CC_dependencies_compiler_type=none +-fi +- +-fi +-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type +- +- +- +-if +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then +- am__fastdepCC_TRUE= +- am__fastdepCC_FALSE='#' +-else +- am__fastdepCC_TRUE='#' +- am__fastdepCC_FALSE= +-fi +- +- +- +- if test "$GCC" = yes; then +- : +- else +- cat >confcache <<\_ACEOF +-# This file is a shell script that caches the results of configure +-# tests run on this system so they can be shared between configure +-# scripts and configure runs, see configure's option --config-cache. +-# It is not useful on other systems. If it contains results you don't +-# want to keep, you may remove or edit it. +-# +-# config.status only pays attention to the cache file if you give it +-# the --recheck option to rerun configure. +-# +-# `ac_cv_env_foo' variables (set or unset) will be overridden when +-# loading this file, other *unset* `ac_cv_foo' will be assigned the +-# following values. +- +-_ACEOF +- +-# The following way of writing the cache mishandles newlines in values, +-# but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. +-# Ultrix sh set writes to stderr and can't be redirected directly, +-# and sets the high bit in the cache file unless we assign to the vars. +-{ +- (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). +- sed -n \ +- "s/'/'\\\\''/g; +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; +- *) +- # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | +- sed ' +- t clear +- : clear +- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ +- t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" +- cat confcache >$cache_file +- else +- echo "not updating unwritable cache $cache_file" +- fi +-fi +-rm -f confcache +- { { echo "$as_me:$LINENO: error: the C compiler '$CC' is not a GNU C compiler." >&5 +-echo "$as_me: error: the C compiler '$CC' is not a GNU C compiler." >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- +- +-# Configure inlining (XXX: need to probe gcc for support?) +- +-cat >>confdefs.h <<\_ACEOF +-#define CR_INLINE static __inline__ __attribute__ ((__unused__)) +-_ACEOF +- +- +-# Check for additional flags needed when building libcr +-if test x"$cr_build_libcr" = xyes; then +-CR_LIBCR_CFLAGS="" +- +- echo "$as_me:$LINENO: checking whether gcc accepts -Wall" >&5 +-echo $ECHO_N "checking whether gcc accepts -Wall... $ECHO_C" >&6 +-if test "${cr_cv_gcc_flag_WALL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- SAVE_CFLAGS=$CFLAGS +- CFLAGS="$CFLAGS -Wall" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cr_cv_gcc_flag_WALL=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-cr_cv_gcc_flag_WALL=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS=$SAVE_CFLAGS +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_gcc_flag_WALL" >&5 +-echo "${ECHO_T}$cr_cv_gcc_flag_WALL" >&6 +- +- if eval test $cr_cv_gcc_flag_WALL = yes; then +- CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wall" +- else +- : +- fi +- +- +- +- echo "$as_me:$LINENO: checking whether gcc accepts -Wno-unused-function" >&5 +-echo $ECHO_N "checking whether gcc accepts -Wno-unused-function... $ECHO_C" >&6 +-if test "${cr_cv_gcc_flag_WNO_UNUSED_FUNCTION+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- SAVE_CFLAGS=$CFLAGS +- CFLAGS="$CFLAGS -Wno-unused-function" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-cr_cv_gcc_flag_WNO_UNUSED_FUNCTION=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS=$SAVE_CFLAGS +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&5 +-echo "${ECHO_T}$cr_cv_gcc_flag_WNO_UNUSED_FUNCTION" >&6 +- +- if eval test $cr_cv_gcc_flag_WNO_UNUSED_FUNCTION = yes; then +- CR_LIBCR_CFLAGS="$CR_LIBCR_CFLAGS -Wno-unused-function" +- else +- : +- fi +- +- +- +-fi # cr_build_libcr +- +-# Additional flags needed when linking utils, tests and examples +-CR_CLIENT_LDADD="" +-if test x"$enable_all_static" = xyes; then +- CR_CLIENT_LDADD="$CR_CLIENT_LDADD -all-static" +-fi +- +- +-# If building the tests, we can optionally test C++ +-if test x"$cr_build_tests" = xyes; then ++ + + # Totally gross way to perform a non-fatal probe for CXX + +@@ -21235,445 +16905,60 @@ + # Now validate the choice + if test "x$CXX" != xno; then + +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- echo "$as_me:$LINENO: checking for void *" >&5 +-echo $ECHO_N "checking for void *... $ECHO_C" >&6 +-if test "${ac_cv_type_void_p+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-if ((void * *) 0) +- return 0; +-if (sizeof (void *)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_type_void_p=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_type_void_p=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5 +-echo "${ECHO_T}$ac_cv_type_void_p" >&6 +- +-echo "$as_me:$LINENO: checking size of void *" >&5 +-echo $ECHO_N "checking size of void *... $ECHO_C" >&6 +-if test "${ac_cv_sizeof_void_p+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ # The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 ++$as_echo_n "checking size of void *... " >&6; } ++if test "${ac_cv_sizeof_void_p+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : ++ + else + if test "$ac_cv_type_void_p" = yes; then +- # The cast to unsigned long works around a bug in the HP C Compiler +- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +- # This bug is HP SR number 8606223364. +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo= ac_hi= +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr '(' $ac_mid ')' + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) ac_cv_sizeof_void_p=$ac_lo;; +-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute sizeof (void *), 77 +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ;; +-esac +-else +- if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-long longval () { return (long) (sizeof (void *)); } +-unsigned long ulongval () { return (long) (sizeof (void *)); } +-#include +-#include +-int +-main () +-{ +- +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- exit (1); +- if (((long) (sizeof (void *))) < 0) +- { +- long i = longval (); +- if (i != ((long) (sizeof (void *)))) +- exit (1); +- fprintf (f, "%ld\n", i); +- } +- else +- { +- unsigned long i = ulongval (); +- if (i != ((long) (sizeof (void *)))) +- exit (1); +- fprintf (f, "%lu\n", i); +- } +- exit (ferror (f) || fclose (f) != 0); +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_sizeof_void_p=`cat conftest.val` +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute sizeof (void *), 77 +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-fi +-rm -f conftest.val +-else +- ac_cv_sizeof_void_p=0 +-fi +-fi +-echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5 +-echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (void *) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_void_p=0 ++ fi ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 ++$as_echo "$ac_cv_sizeof_void_p" >&6; } ++ ++ ++ + cat >>confdefs.h <<_ACEOF + #define SIZEOF_VOID_P $ac_cv_sizeof_void_p + _ACEOF + + +- ac_ext=cc ++ ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +- echo "$as_me:$LINENO: checking whether CXX='$CXX' acts like a C++ compiler" >&5 +-echo $ECHO_N "checking whether CXX='$CXX' acts like a C++ compiler... $ECHO_C" >&6 +-if test "${cr_cv_cxx_is_cxx+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CXX='$CXX' acts like a C++ compiler" >&5 ++$as_echo_n "checking whether CXX='$CXX' acts like a C++ compiler... " >&6; } ++if test "${cr_cv_cxx_is_cxx+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_cxx_is_cxx=no +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #ifndef __cplusplus +@@ -21688,52 +16973,23 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + cr_cv_cxx_is_cxx=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_cxx_is_cxx" >&5 +-echo "${ECHO_T}$cr_cv_cxx_is_cxx" >&6 ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_cxx_is_cxx" >&5 ++$as_echo "$cr_cv_cxx_is_cxx" >&6; } + if test x"$cr_cv_cxx_is_cxx" = xyes; then +- echo "$as_me:$LINENO: checking whether CXX='$CXX' matches wordsize of CC" >&5 +-echo $ECHO_N "checking whether CXX='$CXX' matches wordsize of CC... $ECHO_C" >&6 +-if test "${cr_cv_cxx_voidp+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CXX='$CXX' matches wordsize of CC" >&5 ++$as_echo_n "checking whether CXX='$CXX' matches wordsize of CC... " >&6; } ++if test "${cr_cv_cxx_voidp+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_cxx_voidp=no +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #ifndef __cplusplus +@@ -21748,39 +17004,14 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_cxx_try_compile "$LINENO"; then : + cr_cv_cxx_voidp=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_cxx_voidp" >&5 +-echo "${ECHO_T}$cr_cv_cxx_voidp" >&6 ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_cxx_voidp" >&5 ++$as_echo "$cr_cv_cxx_voidp" >&6; } + fi + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -21793,7 +17024,6 @@ + fi + fi + +-fi + + ################################################################################ + # Check libraries +@@ -21803,17 +17033,13 @@ + # Check for a sufficiently new glibc + # XXX: What is our true lower bound? + +- echo "$as_me:$LINENO: checking for GNU libc version >= 2.2" >&5 +-echo $ECHO_N "checking for GNU libc version >= 2.2... $ECHO_C" >&6 +-if test "${cr_cv_check_glibc_2_2_or_higher+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc version >= 2.2" >&5 ++$as_echo_n "checking for GNU libc version >= 2.2... " >&6; } ++if test "${cr_cv_check_glibc_2_2_or_higher+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -21836,41 +17062,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_link "$LINENO"; then : + cr_cv_check_glibc_2_2_or_higher=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-cr_cv_check_glibc_2_2_or_higher=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_check_glibc_2_2_or_higher" >&5 +-echo "${ECHO_T}$cr_cv_check_glibc_2_2_or_higher" >&6 ++ cr_cv_check_glibc_2_2_or_higher=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_check_glibc_2_2_or_higher" >&5 ++$as_echo "$cr_cv_check_glibc_2_2_or_higher" >&6; } + + if eval test $cr_cv_check_glibc_2_2_or_higher = yes; then + : +@@ -21893,116 +17095,106 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +- { { echo "$as_me:$LINENO: error: the C library does not appear to be glibc 2.2 or higher." >&5 +-echo "$as_me: error: the C library does not appear to be glibc 2.2 or higher." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "the C library does not appear to be glibc 2.2 or higher." "$LINENO" 5 + fi + + + + # Checks for required libraries and fail if they are not found + # Note that we are NOT adding them to LIBS, just verifying their presence. +-echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5 +-echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 +-if test "${ac_cv_lib_dl_dlsym+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5 ++$as_echo_n "checking for dlsym in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlsym+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char dlsym (); + int + main () + { +-dlsym (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++return dlsym (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlsym=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_dl_dlsym=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++ ac_cv_lib_dl_dlsym=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5 +-echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 +-if test $ac_cv_lib_dl_dlsym = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5 ++$as_echo "$ac_cv_lib_dl_dlsym" >&6; } ++if test "x$ac_cv_lib_dl_dlsym" = x""yes; then : + : + else + cat >confcache <<\_ACEOF +@@ -22023,112 +17215,102 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +- { { echo "$as_me:$LINENO: error: required library libdl not found." >&5 +-echo "$as_me: error: required library libdl not found." >&2;} +- { (exit 1); exit 1; }; } +-fi +- +-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 +-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ as_fn_error "required library libdl not found." "$LINENO" 5 ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 ++$as_echo_n "checking for pthread_create in -lpthread... " >&6; } ++if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpthread $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any gcc2 internal prototype to avoid an error. */ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ + char pthread_create (); + int + main () + { +-pthread_create (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++return pthread_create (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pthread_pthread_create=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_lib_pthread_pthread_create=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++ ac_cv_lib_pthread_pthread_create=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 +-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 +-if test $ac_cv_lib_pthread_pthread_create = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 ++$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } ++if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : + : + else + cat >confcache <<\_ACEOF +@@ -22149,45 +17331,63 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +- { { echo "$as_me:$LINENO: error: required library libpthread not found." >&5 +-echo "$as_me: error: required library libpthread not found." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "required library libpthread not found." "$LINENO" 5 + fi + + +@@ -22205,36 +17405,29 @@ + + + # Look for LinuxThreads in the default (probably dynamic) library +-echo "$as_me:$LINENO: checking whether default pthreads library is LinuxThreads" >&5 +-echo $ECHO_N "checking whether default pthreads library is LinuxThreads... $ECHO_C" >&6 +-if test "${cr_cv_pt_default_lt+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether default pthreads library is LinuxThreads" >&5 ++$as_echo_n "checking whether default pthreads library is LinuxThreads... " >&6; } ++if test "${cr_cv_pt_default_lt+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + SAVE_LIBS="$LIBS" + LIBS="-lpthread $LIBS" + +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + + + if test "${cross_linuxthreads-unset}" = unset; then +- { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_linuxthreads must be set." >&5 +-echo "$as_me: error: When cross-compiling, variable cross_linuxthreads must be set." >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- if test x"$cross_linuxthreads" != x0; then ++ as_fn_error "When cross-compiling, variable cross_linuxthreads must be set." "$LINENO" 5 ++ fi ++ ++ if test x"$cross_linuxthreads" != x0; then : + cr_cv_pt_default_lt=yes + else + cr_cv_pt_default_lt=no + fi +- +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -22261,47 +17454,32 @@ + return ((long)join_val == (long)getpid()); + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_run "$LINENO"; then : + cr_cv_pt_default_lt=yes + else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-cr_cv_pt_default_lt=no +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi ++ cr_cv_pt_default_lt=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ + + LIBS="$SAVE_LIBS" + + fi +-echo "$as_me:$LINENO: result: $cr_cv_pt_default_lt" >&5 +-echo "${ECHO_T}$cr_cv_pt_default_lt" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_pt_default_lt" >&5 ++$as_echo "$cr_cv_pt_default_lt" >&6; } + if test x"$cr_cv_pt_default_lt" = xyes; then +- { { echo "$as_me:$LINENO: error: linking of BLCR to LinuxThreads is NOT supported. Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&5 +-echo "$as_me: error: linking of BLCR to LinuxThreads is NOT supported. Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "linking of BLCR to LinuxThreads is NOT supported. Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." "$LINENO" 5 + fi + + # Now look for LinuxThreads in the static libs if we are building static ones ourself + if test x"$enable_static" = xyes; then + # Look for LinuxThreads in the static library +- echo "$as_me:$LINENO: checking whether static pthreads library is LinuxThreads" >&5 +-echo $ECHO_N "checking whether static pthreads library is LinuxThreads... $ECHO_C" >&6 +-if test "${cr_cv_pt_static_lt+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether static pthreads library is LinuxThreads" >&5 ++$as_echo_n "checking whether static pthreads library is LinuxThreads... " >&6; } ++if test "${cr_cv_pt_static_lt+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + SAVE_LIBS="$LIBS" +@@ -22309,27 +17487,20 @@ + LDFLAGS="$LDFLAGS -static" + LIBS="-lpthread $LIBS" + +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + + + if test "${cross_linuxthreads_static-unset}" = unset; then +- { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_linuxthreads_static must be set." >&5 +-echo "$as_me: error: When cross-compiling, variable cross_linuxthreads_static must be set." >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- if test x"$cross_linuxthreads_static" != x0; then ++ as_fn_error "When cross-compiling, variable cross_linuxthreads_static must be set." "$LINENO" 5 ++ fi ++ ++ if test x"$cross_linuxthreads_static" != x0; then : + cr_cv_pt_static_lt=yes + else + cr_cv_pt_static_lt=no + fi +- +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -22356,38 +17527,25 @@ + return ((long)join_val == (long)getpid()); + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_run "$LINENO"; then : + cr_cv_pt_static_lt=yes + else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-cr_cv_pt_static_lt=no +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi ++ cr_cv_pt_static_lt=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ + + LIBS="$SAVE_LIBS" + LDFLAGS="$SAVE_LDFLAGS" + + fi +-echo "$as_me:$LINENO: result: $cr_cv_pt_static_lt" >&5 +-echo "${ECHO_T}$cr_cv_pt_static_lt" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_pt_static_lt" >&5 ++$as_echo "$cr_cv_pt_static_lt" >&6; } + if test x"$cr_cv_pt_static_lt" = xyes; then +- { echo "$as_me:$LINENO: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&5 +-echo "$as_me: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&5 ++$as_echo "$as_me: WARNING: static linking with pthreads appears to yield LinuxThreads, but BLCR supports only NPTL." >&2;} + cr_static_link_warning="yes" + if test x"$enable_all_static" = xyes; then + cat >confcache <<\_ACEOF +@@ -22408,147 +17566,74 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +- { { echo "$as_me:$LINENO: error: static linking of BLCR to LinuxThreads is NOT supported. Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&5 +-echo "$as_me: error: static linking of BLCR to LinuxThreads is NOT supported. Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "static linking of BLCR to LinuxThreads is NOT supported. Please try LDFLAGS='$ldsuggest' (or similar) on the configure command line to get NPTL." "$LINENO" 5 + fi + fi + fi + + # Check for atfork handling +- + for ac_func in __register_atfork +-do +-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +-choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} +-#endif +- +-int +-main () +-{ +-return f != $ac_func; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- eval "$as_ac_var=yes" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-eval "$as_ac_var=no" +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +-if test `eval echo '${'$as_ac_var'}'` = yes; then ++do : ++ ac_fn_c_check_func "$LINENO" "__register_atfork" "ac_cv_func___register_atfork" ++if test "x$ac_cv_func___register_atfork" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE___REGISTER_ATFORK 1 + _ACEOF + + fi +@@ -22558,103 +17643,12 @@ + # Check for pthread_attr_setstacksize + SAVE_LIBS="$LIBS" + LIBS="-lpthread $LIBS" +- + for ac_func in pthread_attr_setstacksize +-do +-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-{ +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +-choke me +-#else +-char (*f) () = $ac_func; +-#endif +-#ifdef __cplusplus +-} +-#endif +- +-int +-main () +-{ +-return f != $ac_func; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- eval "$as_ac_var=yes" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-eval "$as_ac_var=no" +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +-if test `eval echo '${'$as_ac_var'}'` = yes; then ++do : ++ ac_fn_c_check_func "$LINENO" "pthread_attr_setstacksize" "ac_cv_func_pthread_attr_setstacksize" ++if test "x$ac_cv_func_pthread_attr_setstacksize" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 + _ACEOF + + fi +@@ -22663,17 +17657,13 @@ + LIBS="$SAVE_LIBS" + + # Look for prctl(PR_SET_PDEATHSIG, ...) +-echo "$as_me:$LINENO: checking for pctrl()" >&5 +-echo $ECHO_N "checking for pctrl()... $ECHO_C" >&6 +-if test "${cr_cv_prctl+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pctrl()" >&5 ++$as_echo_n "checking for pctrl()... " >&6; } ++if test "${cr_cv_prctl+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -22688,53 +17678,24 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + cr_cv_prctl=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-cr_cv_prctl=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_prctl" >&5 +-echo "${ECHO_T}$cr_cv_prctl" >&6 ++ cr_cv_prctl=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_prctl" >&5 ++$as_echo "$cr_cv_prctl" >&6; } + + if test x$cr_cv_prctl = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PRCTL 1 +-_ACEOF +- +- else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PRCTL 0 +-_ACEOF +- +- fi +- ++ $as_echo "#define HAVE_PRCTL 1" >>confdefs.h ++ ++ else ++ $as_echo "#define HAVE_PRCTL 0" >>confdefs.h ++ ++ fi + + + +@@ -22744,349 +17705,22 @@ + + CR_ASM_OP_HAND_CHKPT="" + +- echo "$as_me:$LINENO: checking for value of CR_ASM_OP_HAND_CHKPT" >&5 +-echo $ECHO_N "checking for value of CR_ASM_OP_HAND_CHKPT... $ECHO_C" >&6 +-if test "${cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_ASM_OP_HAND_CHKPT" >&5 ++$as_echo_n "checking for value of CR_ASM_OP_HAND_CHKPT... " >&6; } ++if test "${cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT="" +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include "blcr_ioctl.h" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include "blcr_ioctl.h" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include "blcr_ioctl.h" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include "blcr_ioctl.h" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo= ac_hi= +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include "blcr_ioctl.h" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_OP_HAND_CHKPT) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr '(' $ac_mid ')' + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT=$ac_lo;; +-'') ;; +-esac +-else +- if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include "blcr_ioctl.h" +-long longval () { return CR_OP_HAND_CHKPT; } +-unsigned long ulongval () { return CR_OP_HAND_CHKPT; } +-#include +-#include +-int +-main () +-{ +- +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- exit (1); +- if ((CR_OP_HAND_CHKPT) < 0) +- { +- long i = longval (); +- if (i != (CR_OP_HAND_CHKPT)) +- exit (1); +- fprintf (f, "%ld\n", i); +- } +- else +- { +- unsigned long i = ulongval (); +- if (i != (CR_OP_HAND_CHKPT)) +- exit (1); +- fprintf (f, "%lu\n", i); +- } +- exit (ferror (f) || fclose (f) != 0); +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT=`cat conftest.val` +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-fi +-rm -f conftest.val +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&5 +-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&6 ++ if ac_fn_c_compute_int "$LINENO" "CR_OP_HAND_CHKPT" "cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" "#include ++ #include \"blcr_ioctl.h\""; then : ++ ++fi ++ ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&5 ++$as_echo "$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" >&6; } + if test -n "$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT"; then + CR_ASM_OP_HAND_CHKPT="$cr_cv_compute_int_CR_ASM_OP_HAND_CHKPT" + fi +@@ -23097,349 +17731,26 @@ + _ACEOF + + +- + fi + + + CR_ASM_CHECKPOINT_STUB="" + +- echo "$as_me:$LINENO: checking for value of CR_ASM_CHECKPOINT_STUB" >&5 +-echo $ECHO_N "checking for value of CR_ASM_CHECKPOINT_STUB... $ECHO_C" >&6 +-if test "${cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_ASM_CHECKPOINT_STUB" >&5 ++$as_echo_n "checking for value of CR_ASM_CHECKPOINT_STUB... " >&6; } ++if test "${cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB="" +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include "blcr_common.h.in" +-int +-main () +-{ +-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include "blcr_common.h.in" +-int +-main () +-{ +-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include "blcr_common.h.in" +-int +-main () +-{ +-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include "blcr_common.h.in" +-int +-main () +-{ +-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo= ac_hi= +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include "blcr_common.h.in" +-int +-main () +-{ +-static int test_array [1 - 2 * !((_CR_CHECKPOINT_STUB) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr '(' $ac_mid ')' + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB=$ac_lo;; +-'') ;; +-esac +-else +- if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include "blcr_common.h.in" +-long longval () { return _CR_CHECKPOINT_STUB; } +-unsigned long ulongval () { return _CR_CHECKPOINT_STUB; } +-#include +-#include +-int +-main () +-{ +- +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- exit (1); +- if ((_CR_CHECKPOINT_STUB) < 0) +- { +- long i = longval (); +- if (i != (_CR_CHECKPOINT_STUB)) +- exit (1); +- fprintf (f, "%ld\n", i); +- } +- else +- { +- unsigned long i = ulongval (); +- if (i != (_CR_CHECKPOINT_STUB)) +- exit (1); +- fprintf (f, "%lu\n", i); +- } +- exit (ferror (f) || fclose (f) != 0); +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB=`cat conftest.val` +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-fi +-rm -f conftest.val +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&5 +-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&6 ++ if ac_fn_c_compute_int "$LINENO" "_CR_CHECKPOINT_STUB" "cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" "#include \"blcr_common.h.in\""; then : ++ ++fi ++ ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&5 ++$as_echo "$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" >&6; } + if test -n "$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB"; then + CR_ASM_CHECKPOINT_STUB="$cr_cv_compute_int_CR_ASM_CHECKPOINT_STUB" + fi +@@ -23450,355 +17761,27 @@ + _ACEOF + + +- + fi + # ICK! + + CR_ASM_OP_HAND_ABORT="" + +- echo "$as_me:$LINENO: checking for value of CR_ASM_OP_HAND_ABORT" >&5 +-echo $ECHO_N "checking for value of CR_ASM_OP_HAND_ABORT... $ECHO_C" >&6 +-if test "${cr_cv_compute_int_CR_ASM_OP_HAND_ABORT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_ASM_OP_HAND_ABORT" >&5 ++$as_echo_n "checking for value of CR_ASM_OP_HAND_ABORT... " >&6; } ++if test "${cr_cv_compute_int_CR_ASM_OP_HAND_ABORT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_compute_int_CR_ASM_OP_HAND_ABORT="" +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include "blcr_ioctl.h" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include "blcr_ioctl.h" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include "blcr_ioctl.h" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include "blcr_ioctl.h" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo= ac_hi= +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include "blcr_ioctl.h" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_OP_HAND_ABORT) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr '(' $ac_mid ')' + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) cr_cv_compute_int_CR_ASM_OP_HAND_ABORT=$ac_lo;; +-'') ;; +-esac +-else +- if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include "blcr_ioctl.h" +-long longval () { return CR_OP_HAND_ABORT; } +-unsigned long ulongval () { return CR_OP_HAND_ABORT; } +-#include +-#include +-int +-main () +-{ +- +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- exit (1); +- if ((CR_OP_HAND_ABORT) < 0) +- { +- long i = longval (); +- if (i != (CR_OP_HAND_ABORT)) +- exit (1); +- fprintf (f, "%ld\n", i); +- } +- else +- { +- unsigned long i = ulongval (); +- if (i != (CR_OP_HAND_ABORT)) +- exit (1); +- fprintf (f, "%lu\n", i); +- } +- exit (ferror (f) || fclose (f) != 0); +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cr_cv_compute_int_CR_ASM_OP_HAND_ABORT=`cat conftest.val` +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-fi +-rm -f conftest.val +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&5 +-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&6 ++ if ac_fn_c_compute_int "$LINENO" "CR_OP_HAND_ABORT" "cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" "#include ++ #include \"blcr_ioctl.h\""; then : ++ ++fi ++ ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&5 ++$as_echo "$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" >&6; } + if test -n "$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT"; then + CR_ASM_OP_HAND_ABORT="$cr_cv_compute_int_CR_ASM_OP_HAND_ABORT" + fi +@@ -23809,349 +17792,26 @@ + _ACEOF + + +- + fi + + + CR_ASM_CHECKPOINT_OMIT="" + +- echo "$as_me:$LINENO: checking for value of CR_ASM_CHECKPOINT_OMIT" >&5 +-echo $ECHO_N "checking for value of CR_ASM_CHECKPOINT_OMIT... $ECHO_C" >&6 +-if test "${cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_ASM_CHECKPOINT_OMIT" >&5 ++$as_echo_n "checking for value of CR_ASM_CHECKPOINT_OMIT... " >&6; } ++if test "${cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT="" +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include "blcr_common.h.in" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include "blcr_common.h.in" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include "blcr_common.h.in" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include "blcr_common.h.in" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo= ac_hi= +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include "blcr_common.h.in" +-int +-main () +-{ +-static int test_array [1 - 2 * !((CR_CHECKPOINT_OMIT) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr '(' $ac_mid ')' + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT=$ac_lo;; +-'') ;; +-esac +-else +- if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include "blcr_common.h.in" +-long longval () { return CR_CHECKPOINT_OMIT; } +-unsigned long ulongval () { return CR_CHECKPOINT_OMIT; } +-#include +-#include +-int +-main () +-{ +- +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- exit (1); +- if ((CR_CHECKPOINT_OMIT) < 0) +- { +- long i = longval (); +- if (i != (CR_CHECKPOINT_OMIT)) +- exit (1); +- fprintf (f, "%ld\n", i); +- } +- else +- { +- unsigned long i = ulongval (); +- if (i != (CR_CHECKPOINT_OMIT)) +- exit (1); +- fprintf (f, "%lu\n", i); +- } +- exit (ferror (f) || fclose (f) != 0); +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT=`cat conftest.val` +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-fi +-rm -f conftest.val +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&5 +-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&6 ++ if ac_fn_c_compute_int "$LINENO" "CR_CHECKPOINT_OMIT" "cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" "#include \"blcr_common.h.in\""; then : ++ ++fi ++ ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&5 ++$as_echo "$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" >&6; } + if test -n "$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT"; then + CR_ASM_CHECKPOINT_OMIT="$cr_cv_compute_int_CR_ASM_CHECKPOINT_OMIT" + fi +@@ -24162,367 +17822,29 @@ + _ACEOF + + +- + fi + # ICK! + + CR_ASM_SI_PID_OFFSET="" + +- echo "$as_me:$LINENO: checking for value of CR_ASM_SI_PID_OFFSET" >&5 +-echo $ECHO_N "checking for value of CR_ASM_SI_PID_OFFSET... $ECHO_C" >&6 +-if test "${cr_cv_compute_int_CR_ASM_SI_PID_OFFSET+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_ASM_SI_PID_OFFSET" >&5 ++$as_echo_n "checking for value of CR_ASM_SI_PID_OFFSET... " >&6; } ++if test "${cr_cv_compute_int_CR_ASM_SI_PID_OFFSET+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_compute_int_CR_ASM_SI_PID_OFFSET="" +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include ++ if ac_fn_c_compute_int "$LINENO" "offsetof(struct siginfo, si_pid)" "cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" "#include + #ifndef offsetof + #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER) +- #endif +-int +-main () +-{ +-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #ifndef offsetof +- #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER) +- #endif +-int +-main () +-{ +-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #ifndef offsetof +- #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER) +- #endif +-int +-main () +-{ +-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #ifndef offsetof +- #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER) +- #endif +-int +-main () +-{ +-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo= ac_hi= +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #ifndef offsetof +- #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER) +- #endif +-int +-main () +-{ +-static int test_array [1 - 2 * !((offsetof(struct siginfo, si_pid)) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr '(' $ac_mid ')' + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) cr_cv_compute_int_CR_ASM_SI_PID_OFFSET=$ac_lo;; +-'') ;; +-esac +-else +- if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #ifndef offsetof +- #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER) +- #endif +-long longval () { return offsetof(struct siginfo, si_pid); } +-unsigned long ulongval () { return offsetof(struct siginfo, si_pid); } +-#include +-#include +-int +-main () +-{ +- +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- exit (1); +- if ((offsetof(struct siginfo, si_pid)) < 0) +- { +- long i = longval (); +- if (i != (offsetof(struct siginfo, si_pid))) +- exit (1); +- fprintf (f, "%ld\n", i); +- } +- else +- { +- unsigned long i = ulongval (); +- if (i != (offsetof(struct siginfo, si_pid))) +- exit (1); +- fprintf (f, "%lu\n", i); +- } +- exit (ferror (f) || fclose (f) != 0); +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cr_cv_compute_int_CR_ASM_SI_PID_OFFSET=`cat conftest.val` +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-fi +-rm -f conftest.val +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&5 +-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&6 ++ #endif"; then : ++ ++fi ++ ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&5 ++$as_echo "$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" >&6; } + if test -n "$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET"; then + CR_ASM_SI_PID_OFFSET="$cr_cv_compute_int_CR_ASM_SI_PID_OFFSET" + fi +@@ -24533,355 +17855,27 @@ + _ACEOF + + +- + fi + + + CR_ASM_NR_ioctl="" + +- echo "$as_me:$LINENO: checking for value of CR_ASM_NR_ioctl" >&5 +-echo $ECHO_N "checking for value of CR_ASM_NR_ioctl... $ECHO_C" >&6 +-if test "${cr_cv_compute_int_CR_ASM_NR_ioctl+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_ASM_NR_ioctl" >&5 ++$as_echo_n "checking for value of CR_ASM_NR_ioctl... " >&6; } ++if test "${cr_cv_compute_int_CR_ASM_NR_ioctl+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_compute_int_CR_ASM_NR_ioctl="" +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include +-int +-main () +-{ +-static int test_array [1 - 2 * !((__NR_ioctl) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include +-int +-main () +-{ +-static int test_array [1 - 2 * !((__NR_ioctl) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include +-int +-main () +-{ +-static int test_array [1 - 2 * !((__NR_ioctl) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include +-int +-main () +-{ +-static int test_array [1 - 2 * !((__NR_ioctl) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo= ac_hi= +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include +-int +-main () +-{ +-static int test_array [1 - 2 * !((__NR_ioctl) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr '(' $ac_mid ')' + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) cr_cv_compute_int_CR_ASM_NR_ioctl=$ac_lo;; +-'') ;; +-esac +-else +- if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include +-long longval () { return __NR_ioctl; } +-unsigned long ulongval () { return __NR_ioctl; } +-#include +-#include +-int +-main () +-{ +- +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- exit (1); +- if ((__NR_ioctl) < 0) +- { +- long i = longval (); +- if (i != (__NR_ioctl)) +- exit (1); +- fprintf (f, "%ld\n", i); +- } +- else +- { +- unsigned long i = ulongval (); +- if (i != (__NR_ioctl)) +- exit (1); +- fprintf (f, "%lu\n", i); +- } +- exit (ferror (f) || fclose (f) != 0); +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cr_cv_compute_int_CR_ASM_NR_ioctl=`cat conftest.val` +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-fi +-rm -f conftest.val +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_NR_ioctl" >&5 +-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_NR_ioctl" >&6 ++ if ac_fn_c_compute_int "$LINENO" "__NR_ioctl" "cr_cv_compute_int_CR_ASM_NR_ioctl" "#include ++ #include "; then : ++ ++fi ++ ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_NR_ioctl" >&5 ++$as_echo "$cr_cv_compute_int_CR_ASM_NR_ioctl" >&6; } + if test -n "$cr_cv_compute_int_CR_ASM_NR_ioctl"; then + CR_ASM_NR_ioctl="$cr_cv_compute_int_CR_ASM_NR_ioctl" + fi +@@ -24892,355 +17886,27 @@ + _ACEOF + + +- + fi + + + CR_ASM_NR_rt_sigreturn="" + +- echo "$as_me:$LINENO: checking for value of CR_ASM_NR_rt_sigreturn" >&5 +-echo $ECHO_N "checking for value of CR_ASM_NR_rt_sigreturn... $ECHO_C" >&6 +-if test "${cr_cv_compute_int_CR_ASM_NR_rt_sigreturn+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_ASM_NR_rt_sigreturn" >&5 ++$as_echo_n "checking for value of CR_ASM_NR_rt_sigreturn... " >&6; } ++if test "${cr_cv_compute_int_CR_ASM_NR_rt_sigreturn+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_compute_int_CR_ASM_NR_rt_sigreturn="" +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include +-int +-main () +-{ +-static int test_array [1 - 2 * !((__NR_rt_sigreturn) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include +-int +-main () +-{ +-static int test_array [1 - 2 * !((__NR_rt_sigreturn) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include +-int +-main () +-{ +-static int test_array [1 - 2 * !((__NR_rt_sigreturn) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include +-int +-main () +-{ +-static int test_array [1 - 2 * !((__NR_rt_sigreturn) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo= ac_hi= +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include +-int +-main () +-{ +-static int test_array [1 - 2 * !((__NR_rt_sigreturn) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr '(' $ac_mid ')' + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) cr_cv_compute_int_CR_ASM_NR_rt_sigreturn=$ac_lo;; +-'') ;; +-esac +-else +- if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +- #include +-long longval () { return __NR_rt_sigreturn; } +-unsigned long ulongval () { return __NR_rt_sigreturn; } +-#include +-#include +-int +-main () +-{ +- +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- exit (1); +- if ((__NR_rt_sigreturn) < 0) +- { +- long i = longval (); +- if (i != (__NR_rt_sigreturn)) +- exit (1); +- fprintf (f, "%ld\n", i); +- } +- else +- { +- unsigned long i = ulongval (); +- if (i != (__NR_rt_sigreturn)) +- exit (1); +- fprintf (f, "%lu\n", i); +- } +- exit (ferror (f) || fclose (f) != 0); +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cr_cv_compute_int_CR_ASM_NR_rt_sigreturn=`cat conftest.val` +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-fi +-rm -f conftest.val +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&5 +-echo "${ECHO_T}$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&6 ++ if ac_fn_c_compute_int "$LINENO" "__NR_rt_sigreturn" "cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" "#include ++ #include "; then : ++ ++fi ++ ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&5 ++$as_echo "$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" >&6; } + if test -n "$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn"; then + CR_ASM_NR_rt_sigreturn="$cr_cv_compute_int_CR_ASM_NR_rt_sigreturn" + fi +@@ -25251,25 +17917,22 @@ + _ACEOF + + +- + fi + + CFLAGS="$SAVE_CFLAGS" + + # Probe for direction of stack growth + +- echo "$as_me:$LINENO: checking for direction of stack growth" >&5 +-echo $ECHO_N "checking for direction of stack growth... $ECHO_C" >&6 +-if test "${cr_cv_check_stack_direction+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- if test "$cross_compiling" = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for direction of stack growth" >&5 ++$as_echo_n "checking for direction of stack growth... " >&6; } ++if test "${cr_cv_check_stack_direction+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ if test "$cross_compiling" = yes; then : + + if test "${cross_stack_direction-unset}" = unset; then +- { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_stack_direction must be set." >&5 +-echo "$as_me: error: When cross-compiling, variable cross_stack_direction must be set." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "When cross-compiling, variable cross_stack_direction must be set." "$LINENO" 5 + fi + + if test $cross_stack_direction = 1; then +@@ -25278,11 +17941,7 @@ + cr_cv_check_stack_direction=down + fi + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int find_stack_direction (void) { +@@ -25299,32 +17958,19 @@ + return find_stack_direction(); + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_run "$LINENO"; then : + cr_cv_check_stack_direction=up + else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-cr_cv_check_stack_direction=down +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_check_stack_direction" >&5 +-echo "${ECHO_T}$cr_cv_check_stack_direction" >&6 ++ cr_cv_check_stack_direction=down ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_check_stack_direction" >&5 ++$as_echo "$cr_cv_check_stack_direction" >&6; } + if test $cr_cv_check_stack_direction = up; then + cr_stack_direction=1 + else +@@ -25337,7 +17983,6 @@ + + + +- + # Look for FTB header and libs + cr_have_ftb=no + if test x"$FTB_HOME" != xno; then +@@ -25347,20 +17992,16 @@ + SAVE_LIBS="$LIBS" + CR_FTB_INCLUDES="" + CR_FTB_LDFLAGS="" +- echo "$as_me:$LINENO: checking for FTB headers" >&5 +-echo $ECHO_N "checking for FTB headers... $ECHO_C" >&6 +-if test "${cr_cv_ftb_incdir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FTB headers" >&5 ++$as_echo_n "checking for FTB headers... " >&6; } ++if test "${cr_cv_ftb_incdir+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_result=no + for cr_tmp in "" "${FTB_HOME}/include"; do + CPPFLAGS="$SAVE_CPPFLAGS${cr_tmp:+ -I$cr_tmp}" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -25375,35 +18016,10 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + cr_result="$cr_tmp"; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done + if test -z "$cr_result"; then + cr_cv_ftb_incdir="default" +@@ -25412,17 +18028,17 @@ + fi + + fi +-echo "$as_me:$LINENO: result: $cr_cv_ftb_incdir" >&5 +-echo "${ECHO_T}$cr_cv_ftb_incdir" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_ftb_incdir" >&5 ++$as_echo "$cr_cv_ftb_incdir" >&6; } + if test x"$cr_cv_ftb_incdir" = xno; then + cr_have_ftb=no + elif test x"$cr_cv_ftb_incdir" != "xdefault"; then + CR_FTB_INCLUDES="-I$cr_cv_ftb_incdir" + fi +- echo "$as_me:$LINENO: checking for FTB libs" >&5 +-echo $ECHO_N "checking for FTB libs... $ECHO_C" >&6 +-if test "${cr_cv_ftb_libdir+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FTB libs" >&5 ++$as_echo_n "checking for FTB libs... " >&6; } ++if test "${cr_cv_ftb_libdir+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + CPPFLAGS="$SAVE_CPPFLAGS $CR_FTB_INCLUDES" +@@ -25430,11 +18046,7 @@ + cr_result=no + for cr_tmp in "" "${FTB_HOME}/lib64" "${FTB_HOME}/lib32" "${FTB_HOME}/lib"; do + LDFLAGS="$SAVE_LDFLAGS${cr_tmp:+-L$cr_tmp}" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -25449,36 +18061,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_link "$LINENO"; then : + cr_result="$cr_tmp"; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + done + if test -z "$cr_result"; then + cr_cv_ftb_libdir="default" +@@ -25487,8 +18074,8 @@ + fi + + fi +-echo "$as_me:$LINENO: result: $cr_cv_ftb_libdir" >&5 +-echo "${ECHO_T}$cr_cv_ftb_libdir" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_ftb_libdir" >&5 ++$as_echo "$cr_cv_ftb_libdir" >&6; } + if test x"$cr_cv_ftb_libdir" = xno; then + cr_have_ftb=no + elif test x"$cr_cv_ftb_libdir" != "xdefault"; then +@@ -25499,9 +18086,7 @@ + LDFLAGS="$SAVE_LDFLAGS" + CPPFLAGS="$SAVE_CPPFLAGS" + if test x"$cr_have_ftb$cr_force_ftb" = xnoyes; then +- { { echo "$as_me:$LINENO: error: Configured with --with-ftb='$FTB_HOME', but unable to build FTB test case" >&5 +-echo "$as_me: error: Configured with --with-ftb='$FTB_HOME', but unable to build FTB test case" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Configured with --with-ftb='$FTB_HOME', but unable to build FTB test case" "$LINENO" 5 + fi + + +@@ -25509,17 +18094,12 @@ + fi + + if test x$cr_have_ftb = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FTB 1 +-_ACEOF +- +- else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FTB 0 +-_ACEOF +- +- fi +- ++ $as_echo "#define HAVE_FTB 1" >>confdefs.h ++ ++ else ++ $as_echo "#define HAVE_FTB 0" >>confdefs.h ++ ++ fi + + + +@@ -25527,30 +18107,24 @@ + + # Probe libc for the RT signal number to use + +- echo "$as_me:$LINENO: checking for value of CR_SIGNUM" >&5 +-echo $ECHO_N "checking for value of CR_SIGNUM... $ECHO_C" >&6 +-if test "${cr_cv_check_cr_signum+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for value of CR_SIGNUM" >&5 ++$as_echo_n "checking for value of CR_SIGNUM... " >&6; } ++if test "${cr_cv_check_cr_signum+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_check_cr_signum="failed" + SAVE_LIBS="$LIBS" + LIBS="-ldl -lpthread $LIBS" +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + + if test "${cross_signum-unset}" = unset; then +- { { echo "$as_me:$LINENO: error: When cross-compiling, variable cross_signum must be set." >&5 +-echo "$as_me: error: When cross-compiling, variable cross_signum must be set." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "When cross-compiling, variable cross_signum must be set." "$LINENO" 5 + fi + + cr_cv_check_cr_signum=$cross_signum + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +@@ -25574,449 +18148,54 @@ + return(0); + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_run "$LINENO"; then : + cr_cv_check_cr_signum=`cat conftestval` + else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-{ { echo "$as_me:$LINENO: error: Failed to probe CR_SIGNUM" >&5 +-echo "$as_me: error: Failed to probe CR_SIGNUM" >&2;} +- { (exit 1); exit 1; }; } +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi ++ as_fn_error "Failed to probe CR_SIGNUM" "$LINENO" 5 ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ + LIBS="$SAVE_LIBS" + + fi +-echo "$as_me:$LINENO: result: $cr_cv_check_cr_signum" >&5 +-echo "${ECHO_T}$cr_cv_check_cr_signum" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_check_cr_signum" >&5 ++$as_echo "$cr_cv_check_cr_signum" >&6; } + CR_SIGNUM=$cr_cv_check_cr_signum + + + + # Check for 32- or 64-bit architecture +-echo "$as_me:$LINENO: checking for void *" >&5 +-echo $ECHO_N "checking for void *... $ECHO_C" >&6 +-if test "${ac_cv_type_void_p+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-if ((void * *) 0) +- return 0; +-if (sizeof (void *)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_type_void_p=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_cv_type_void_p=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5 +-echo "${ECHO_T}$ac_cv_type_void_p" >&6 +- +-echo "$as_me:$LINENO: checking size of void *" >&5 +-echo $ECHO_N "checking size of void *... $ECHO_C" >&6 +-if test "${ac_cv_sizeof_void_p+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++# The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 ++$as_echo_n "checking size of void *... " >&6; } ++if test "${ac_cv_sizeof_void_p+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : ++ + else + if test "$ac_cv_type_void_p" = yes; then +- # The cast to unsigned long works around a bug in the HP C Compiler +- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +- # This bug is HP SR number 8606223364. +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_lo=$ac_mid; break +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo= ac_hi= +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_hi=$ac_mid +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-ac_lo=`expr '(' $ac_mid ')' + 1` +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) ac_cv_sizeof_void_p=$ac_lo;; +-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute sizeof (void *), 77 +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ;; +-esac +-else +- if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-long longval () { return (long) (sizeof (void *)); } +-unsigned long ulongval () { return (long) (sizeof (void *)); } +-#include +-#include +-int +-main () +-{ +- +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- exit (1); +- if (((long) (sizeof (void *))) < 0) +- { +- long i = longval (); +- if (i != ((long) (sizeof (void *)))) +- exit (1); +- fprintf (f, "%ld\n", i); +- } +- else +- { +- unsigned long i = ulongval (); +- if (i != ((long) (sizeof (void *)))) +- exit (1); +- fprintf (f, "%lu\n", i); +- } +- exit (ferror (f) || fclose (f) != 0); +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_sizeof_void_p=`cat conftest.val` +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 +-See \`config.log' for more details." >&5 +-echo "$as_me: error: cannot compute sizeof (void *), 77 +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-fi +-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-fi +-rm -f conftest.val +-else +- ac_cv_sizeof_void_p=0 +-fi +-fi +-echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5 +-echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (void *) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_void_p=0 ++ fi ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 ++$as_echo "$ac_cv_sizeof_void_p" >&6; } ++ ++ ++ + cat >>confdefs.h <<_ACEOF + #define SIZEOF_VOID_P $ac_cv_sizeof_void_p + _ACEOF +@@ -26027,9 +18206,7 @@ + if test $cr_wordsize = 8; then + CR_LIBARCH=$CR_ARCH32 + else +- { { echo "$as_me:$LINENO: error: CC='$CC' yields sizeof(void *) = $ac_cv_sizeof_void_p when expecting $cr_wordsize.$clue" >&5 +-echo "$as_me: error: CC='$CC' yields sizeof(void *) = $ac_cv_sizeof_void_p when expecting $cr_wordsize.$clue" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "CC='$CC' yields sizeof(void *) = $ac_cv_sizeof_void_p when expecting $cr_wordsize.$clue" "$LINENO" 5 + fi + fi + +@@ -26041,25 +18218,15 @@ + cr_build_libcr32=no + if test x"$enable_multilib" = xyes; then + if test x"$cr_build_libcr" != xyes; then +- { { echo "$as_me:$LINENO: error: --enable-multilib requested but not building libcr" >&5 +-echo "$as_me: error: --enable-multilib requested but not building libcr" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "--enable-multilib requested but not building libcr" "$LINENO" 5 + elif test -f "${TOP_BUILDDIR}/configure.ac"; then # More robust than TOP_BUILDDIR == TOP_SRCDIR +- { { echo "$as_me:$LINENO: error: When requesting --enable-multilib, you must configure/build in a directory other than the one holding the BLCR sources" >&5 +-echo "$as_me: error: When requesting --enable-multilib, you must configure/build in a directory other than the one holding the BLCR sources" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "When requesting --enable-multilib, you must configure/build in a directory other than the one holding the BLCR sources" "$LINENO" 5 + elif test -z "$CR_ARCH32"; then +- { { echo "$as_me:$LINENO: error: --enable-multilib not supported on architecture $CR_ARCH" >&5 +-echo "$as_me: error: --enable-multilib not supported on architecture $CR_ARCH" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "--enable-multilib not supported on architecture $CR_ARCH" "$LINENO" 5 + elif test $ac_cv_sizeof_void_p = 4; then +- { { echo "$as_me:$LINENO: error: --enable-multilib requested but CC='$CC' generates 32-bit objects. Perhaps try configuring with CC='$CC -m64' or similar." >&5 +-echo "$as_me: error: --enable-multilib requested but CC='$CC' generates 32-bit objects. Perhaps try configuring with CC='$CC -m64' or similar." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "--enable-multilib requested but CC='$CC' generates 32-bit objects. Perhaps try configuring with CC='$CC -m64' or similar." "$LINENO" 5 + elif test \! -d /lib64; then +- { { echo "$as_me:$LINENO: error: --enable-multilib requested but /lib64 does not exist" >&5 +-echo "$as_me: error: --enable-multilib requested but /lib64 does not exist" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "--enable-multilib requested but /lib64 does not exist" "$LINENO" 5 + fi + if test -z "$libdir32"; then + if expr "$libdir" : '.*/lib64$' >/dev/null; then +@@ -26068,9 +18235,7 @@ + libdir32='${exec_prefix}/lib' + libdir='${exec_prefix}/lib64' + else +- { { echo "$as_me:$LINENO: error: --enable-multilib requested but libdir='$libdir' does not end in 'lib64'" >&5 +-echo "$as_me: error: --enable-multilib requested but libdir='$libdir' does not end in 'lib64'" >&2;} +- { (exit 1); exit 1; }; }; ++ as_fn_error "--enable-multilib requested but libdir='$libdir' does not end in 'lib64'" "$LINENO" 5; + fi + fi + SUBCMD="${TOP_SRCDIR}/configure '--srcdir=${TOP_SRCDIR}' '--build=${CR_ARCH32}-linux' '--libdir=${libdir32}' --with-components=libcr,tests,examples" +@@ -26133,25 +18298,21 @@ + SUBCMD="$SUBCMD 'RANLIB=$RANLIB32'" + fi + # Others? +- { echo "$as_me:$LINENO: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&5 +-echo "$as_me: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&6;} +- { echo "$as_me:$LINENO: ${SUBCMD}" >&5 +-echo "$as_me: ${SUBCMD}" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&5 ++$as_echo "$as_me: >>>> BEGIN sub-configure for 32-bit libs >>>>" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: ${SUBCMD}" >&5 ++$as_echo "$as_me: ${SUBCMD}" >&6;} + ( mkdir -p libcr32 && cd libcr32 && ln -sf ../util util && eval "${SUBCMD}" ) + if test "$?" = 0; then +- { echo "$as_me:$LINENO: <<<< END sub-configure for 32-bit libs <<<<" >&5 +-echo "$as_me: <<<< END sub-configure for 32-bit libs <<<<" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: <<<< END sub-configure for 32-bit libs <<<<" >&5 ++$as_echo "$as_me: <<<< END sub-configure for 32-bit libs <<<<" >&6;} + cr_build_libcr32=yes + else + rm -rf libcr32 +- { { echo "$as_me:$LINENO: error: --enable-multilib requested but FAILED sub-configure for 32-bit libs" >&5 +-echo "$as_me: error: --enable-multilib requested but FAILED sub-configure for 32-bit libs" >&2;} +- { (exit 1); exit 1; }; } +- fi +-fi +- +- +-if test x$cr_build_libcr32 = xyes; then ++ as_fn_error "--enable-multilib requested but FAILED sub-configure for 32-bit libs" "$LINENO" 5 ++ fi ++fi ++ if test x$cr_build_libcr32 = xyes; then + CR_BUILD_LIBCR32_TRUE= + CR_BUILD_LIBCR32_FALSE='#' + else +@@ -26167,64 +18328,205 @@ + if test x"$cr_build_modules" = xyes; then + + # Compiler to build kernel modules +-echo "$as_me:$LINENO: checking compiler to build kernel modules" >&5 +-echo $ECHO_N "checking compiler to build kernel modules... $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler to build kernel modules" >&5 ++$as_echo_n "checking compiler to build kernel modules... " >&6; } + if test -n "${KCC}"; then +- echo "$as_me:$LINENO: result: $KCC (user setting)" >&5 +-echo "${ECHO_T}$KCC (user setting)" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KCC (user setting)" >&5 ++$as_echo "$KCC (user setting)" >&6; } + else + KCC=$CC +- echo "$as_me:$LINENO: result: $KCC (default)" >&5 +-echo "${ECHO_T}$KCC (default)" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KCC (default)" >&5 ++$as_echo "$KCC (default)" >&6; } + fi + + + # Find BSD-compatible NM command +-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 +-if test "${lt_cv_path_NM+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 ++$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } ++if test "${lt_cv_path_NM+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" + else +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- tmp_nm="$ac_dir/${ac_tool_prefix}nm" +- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then +- # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: +- # nm: unknown option "B" ignored +- # Tru64's nm complains that /dev/null is an invalid object file +- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in +- */dev/null* | *'Invalid file or object type'*) +- lt_cv_path_NM="$tmp_nm -B" +- break +- ;; +- *) +- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in +- */dev/null*) +- lt_cv_path_NM="$tmp_nm -p" ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" ++ fi ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) +- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but +- continue # so that we can try to find one that supports BSD flags ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac + ;; + esac +- esac +- fi +- done +- IFS="$lt_save_ifs" +- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm +-fi +-fi +-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +-echo "${ECHO_T}$lt_cv_path_NM" >&6 +-NM="$lt_cv_path_NM" ++ fi ++ done ++ IFS="$lt_save_ifs" ++ done ++ : ${lt_cv_path_NM=no} ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 ++$as_echo "$lt_cv_path_NM" >&6; } ++if test "$lt_cv_path_NM" != "no"; then ++ NM="$lt_cv_path_NM" ++else ++ # Didn't find any BSD compatible name lister, look for dumpbin. ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in "dumpbin -symbols" "link -dump -symbols" ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DUMPBIN+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DUMPBIN"; then ++ ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DUMPBIN=$ac_cv_prog_DUMPBIN ++if test -n "$DUMPBIN"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 ++$as_echo "$DUMPBIN" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$DUMPBIN" && break ++ done ++fi ++if test -z "$DUMPBIN"; then ++ ac_ct_DUMPBIN=$DUMPBIN ++ for ac_prog in "dumpbin -symbols" "link -dump -symbols" ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DUMPBIN"; then ++ ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN ++if test -n "$ac_ct_DUMPBIN"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 ++$as_echo "$ac_ct_DUMPBIN" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_DUMPBIN" && break ++done ++ ++ if test "x$ac_ct_DUMPBIN" = x; then ++ DUMPBIN=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DUMPBIN=$ac_ct_DUMPBIN ++ fi ++fi ++ ++ ++ if test "$DUMPBIN" != ":"; then ++ NM="$DUMPBIN" ++ fi ++fi ++test -z "$NM" && NM=nm ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 ++$as_echo_n "checking the name lister ($NM) interface... " >&6; } ++if test "${lt_cv_nm_interface+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_nm_interface="BSD nm" ++ echo "int some_variable = 0;" > conftest.$ac_ext ++ (eval echo "\"\$as_me:18515: $ac_compile\"" >&5) ++ (eval "$ac_compile" 2>conftest.err) ++ cat conftest.err >&5 ++ (eval echo "\"\$as_me:18518: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) ++ cat conftest.err >&5 ++ (eval echo "\"\$as_me:18521: output\"" >&5) ++ cat conftest.out >&5 ++ if $GREP 'External.*some_variable' conftest.out > /dev/null; then ++ lt_cv_nm_interface="MS dumpbin" ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 ++$as_echo "$lt_cv_nm_interface" >&6; } + + NM=$NM + +@@ -26235,26 +18537,22 @@ + *) + cr_kernel_type=`echo "$with_kernel_type" | tr 'a-z' 'A-Z'` + cr_header="/boot/kernel.h" +- echo "$as_me:$LINENO: checking for $cr_header" >&5 +-echo $ECHO_N "checking for $cr_header... $ECHO_C" >&6; ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $cr_header" >&5 ++$as_echo_n "checking for $cr_header... " >&6; }; + cr_result=ok + if test \! -e "$cr_header"; then + cr_result='missing' + elif test \! -r "$cr_header"; then + cr_result='not readable' + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + if test "$cr_result" != "ok"; then +- { { echo "$as_me:$LINENO: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header is $cr_result." >&5 +-echo "$as_me: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header is $cr_result." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header is $cr_result." "$LINENO" 5 + fi + cr_kernel_var="__BOOT_KERNEL_$cr_kernel_type" + if test -z "`grep \"$cr_kernel_var\" $cr_header 2>/dev/null`"; then +- { { echo "$as_me:$LINENO: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header does not appear to support that type." >&5 +-echo "$as_me: error: You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header does not appear to support that type." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "You have requested '--with-kernel-type=$cr_kernel_type', but $cr_header does not appear to support that type." "$LINENO" 5 + fi + # The following sed command transforms all the #ifndef lines from kernel.h into + # corresponding preprocessor flags (on one line) which select the desired kernel type. +@@ -26276,9 +18574,7 @@ + + if test "${LINUX_OBJ_ARG+set}${cr_cv_var_LINUX_OBJ_ARG+set}" = setset; then + if test "$LINUX_OBJ_ARG" != "$cr_cv_var_LINUX_OBJ_ARG"; then +- { { echo "$as_me:$LINENO: error: Cached LINUX_OBJ_ARG ($cr_cv_var_LINUX_OBJ_ARG) does not match current value ($LINUX_OBJ_ARG). Remove '$cache_file' before re-running configure." >&5 +-echo "$as_me: error: Cached LINUX_OBJ_ARG ($cr_cv_var_LINUX_OBJ_ARG) does not match current value ($LINUX_OBJ_ARG). Remove '$cache_file' before re-running configure." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Cached LINUX_OBJ_ARG ($cr_cv_var_LINUX_OBJ_ARG) does not match current value ($LINUX_OBJ_ARG). Remove '$cache_file' before re-running configure." "$LINENO" 5 + fi + elif test "${cr_cv_var_LINUX_OBJ_ARG+set}" = set; then + LINUX_OBJ_ARG="$cr_cv_var_LINUX_OBJ_ARG" +@@ -26287,11 +18583,11 @@ + if expr X"$LINUX_OBJ_ARG" : X/ >/dev/null; then + # User provided a path + +- echo "$as_me:$LINENO: checking for Linux kernel build in ${LINUX_OBJ_ARG}" >&5 +-echo $ECHO_N "checking for Linux kernel build in ${LINUX_OBJ_ARG}... $ECHO_C" >&6 +- cr_cvname=cr_cv_kernel_obj_`echo "${LINUX_OBJ_ARG}" | $as_tr_sh` +- if eval "test \"\${${cr_cvname}+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kernel build in ${LINUX_OBJ_ARG}" >&5 ++$as_echo_n "checking for Linux kernel build in ${LINUX_OBJ_ARG}... " >&6; } ++ cr_cvname=cr_cv_kernel_obj_`$as_echo "${LINUX_OBJ_ARG}" | $as_tr_sh` ++ if { as_var=${cr_cvname}; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 + else + + if test -d "${LINUX_OBJ_ARG}"; then +@@ -26340,11 +18636,11 @@ + eval "cr_result=\$$cr_cvname" + unset cr_cvname + if expr "$cr_result" : '2\.[46]\.' >/dev/null; then +- echo "$as_me:$LINENO: result: found version $cr_result" >&5 +-echo "${ECHO_T}found version $cr_result" >&6 +- else +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version $cr_result" >&5 ++$as_echo "found version $cr_result" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + fi + # Check that version appears acceptible + +@@ -26357,9 +18653,7 @@ + + + if test -z "$cr_linux_obj_ver"; then +- { { echo "$as_me:$LINENO: error: Directory ${LINUX_OBJ_ARG} does not appear to contain a Linux kernel build" >&5 +-echo "$as_me: error: Directory ${LINUX_OBJ_ARG} does not appear to contain a Linux kernel build" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Directory ${LINUX_OBJ_ARG} does not appear to contain a Linux kernel build" "$LINENO" 5 + else + : + fi +@@ -26371,9 +18665,7 @@ + elif expr "$LINUX_OBJ_ARG" : '2\.[46]\.' >/dev/null; then + cr_tmp_ver="$LINUX_OBJ_ARG" + else +- { { echo "$as_me:$LINENO: error: --with-linux argument '$LINUX_OBJ_ARG' is neither a kernel version string nor a full path" >&5 +-echo "$as_me: error: --with-linux argument '$LINUX_OBJ_ARG' is neither a kernel version string nor a full path" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "--with-linux argument '$LINUX_OBJ_ARG' is neither a kernel version string nor a full path" "$LINENO" 5 + fi + cr_ver_patt="`echo $cr_tmp_ver | sed -e 's/\./\\\\./g;'`\$" + # Search standard locations +@@ -26384,11 +18676,11 @@ + /usr/src/kernels/${cr_tmp_ver} \ + ; do + +- echo "$as_me:$LINENO: checking for Linux kernel build in ${cr_linux_dir}" >&5 +-echo $ECHO_N "checking for Linux kernel build in ${cr_linux_dir}... $ECHO_C" >&6 +- cr_cvname=cr_cv_kernel_obj_`echo "${cr_linux_dir}" | $as_tr_sh` +- if eval "test \"\${${cr_cvname}+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kernel build in ${cr_linux_dir}" >&5 ++$as_echo_n "checking for Linux kernel build in ${cr_linux_dir}... " >&6; } ++ cr_cvname=cr_cv_kernel_obj_`$as_echo "${cr_linux_dir}" | $as_tr_sh` ++ if { as_var=${cr_cvname}; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 + else + + if test -d "${cr_linux_dir}"; then +@@ -26437,11 +18729,11 @@ + eval "cr_result=\$$cr_cvname" + unset cr_cvname + if expr "$cr_result" : '2\.[46]\.' >/dev/null; then +- echo "$as_me:$LINENO: result: found version $cr_result" >&5 +-echo "${ECHO_T}found version $cr_result" >&6 +- else +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version $cr_result" >&5 ++$as_echo "found version $cr_result" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + fi + # Check that version appears acceptible + +@@ -26459,9 +18751,7 @@ + done + + if test -z "$cr_linux_obj_ver"; then +- { { echo "$as_me:$LINENO: error: Could not find a directory containing a Linux kernel ${cr_tmp_ver} build. Perhaps try --with-linux=FULL_PATH_TO_KERNEL_BUILD" >&5 +-echo "$as_me: error: Could not find a directory containing a Linux kernel ${cr_tmp_ver} build. Perhaps try --with-linux=FULL_PATH_TO_KERNEL_BUILD" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Could not find a directory containing a Linux kernel ${cr_tmp_ver} build. Perhaps try --with-linux=FULL_PATH_TO_KERNEL_BUILD" "$LINENO" 5 + else + : + fi +@@ -26476,9 +18766,7 @@ + + if test "${LINUX_SRC_ARG+set}${cr_cv_var_LINUX_SRC_ARG+set}" = setset; then + if test "$LINUX_SRC_ARG" != "$cr_cv_var_LINUX_SRC_ARG"; then +- { { echo "$as_me:$LINENO: error: Cached LINUX_SRC_ARG ($cr_cv_var_LINUX_SRC_ARG) does not match current value ($LINUX_SRC_ARG). Remove '$cache_file' before re-running configure." >&5 +-echo "$as_me: error: Cached LINUX_SRC_ARG ($cr_cv_var_LINUX_SRC_ARG) does not match current value ($LINUX_SRC_ARG). Remove '$cache_file' before re-running configure." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Cached LINUX_SRC_ARG ($cr_cv_var_LINUX_SRC_ARG) does not match current value ($LINUX_SRC_ARG). Remove '$cache_file' before re-running configure." "$LINENO" 5 + fi + elif test "${cr_cv_var_LINUX_SRC_ARG+set}" = set; then + LINUX_SRC_ARG="$cr_cv_var_LINUX_SRC_ARG" +@@ -26487,9 +18775,7 @@ + if expr X"$LINUX_SRC_ARG" : X/ >/dev/null; then + cr_list="$LINUX_SRC_ARG" + elif test -n "$LINUX_SRC_ARG"; then +- { { echo "$as_me:$LINENO: error: --with-linux-src argument '$LINUX_SRC_ARG' is not a full path" >&5 +-echo "$as_me: error: --with-linux-src argument '$LINUX_SRC_ARG' is not a full path" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "--with-linux-src argument '$LINUX_SRC_ARG' is not a full path" "$LINENO" 5 + else + # Search standard locations + cr_list="${LINUX_OBJ} \ +@@ -26499,11 +18785,11 @@ + fi + for cr_linux_dir in $cr_list; do + +- echo "$as_me:$LINENO: checking for Linux kernel source in $cr_linux_dir" >&5 +-echo $ECHO_N "checking for Linux kernel source in $cr_linux_dir... $ECHO_C" >&6 +- cr_cvname=cr_cv_kernel_src_`echo "$cr_linux_dir" | $as_tr_sh` +- if eval "test \"\${${cr_cvname}+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kernel source in $cr_linux_dir" >&5 ++$as_echo_n "checking for Linux kernel source in $cr_linux_dir... " >&6; } ++ cr_cvname=cr_cv_kernel_src_`$as_echo "$cr_linux_dir" | $as_tr_sh` ++ if { as_var=${cr_cvname}; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_tmp='' +@@ -26578,11 +18864,11 @@ + eval "cr_result=\$$cr_cvname" + unset cr_cvname + if expr "$cr_result" : '2\.[46]\.' >/dev/null; then +- echo "$as_me:$LINENO: result: found version $cr_result" >&5 +-echo "${ECHO_T}found version $cr_result" >&6 +- else +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version $cr_result" >&5 ++$as_echo "found version $cr_result" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + fi + # Check that version is acceptible (exact match, or a prefix with the next char non-numeric) + case "$cr_linux_obj_ver" in +@@ -26598,9 +18884,7 @@ + done + + if test -z "$cr_linux_src_ver"; then +- { { echo "$as_me:$LINENO: error: Could not locate source directory corresponding to build directory '${LINUX_OBJ}'. Please use --with-linux-src=FULL_PATH_TO_KERNEL_SRC" >&5 +-echo "$as_me: error: Could not locate source directory corresponding to build directory '${LINUX_OBJ}'. Please use --with-linux-src=FULL_PATH_TO_KERNEL_SRC" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Could not locate source directory corresponding to build directory '${LINUX_OBJ}'. Please use --with-linux-src=FULL_PATH_TO_KERNEL_SRC" "$LINENO" 5 + else + : + fi +@@ -26628,8 +18912,8 @@ + : # OK - either not caching or cached version still matches + else + if test -f .cached_kconfig; then +- { echo "$as_me:$LINENO: WARNING: kernel configuration has changed... discarding cached results." >&5 +-echo "$as_me: WARNING: kernel configuration has changed... discarding cached results." >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: kernel configuration has changed... discarding cached results." >&5 ++$as_echo "$as_me: WARNING: kernel configuration has changed... discarding cached results." >&2;} + rm -f .cached_kconfig + fi + for cr_var in cr_cv_kconfig__NON_EMPTY_HACK `(set) | grep "^cr_cv_kconfig_" | cut -d= -f1`; do +@@ -26644,7 +18928,7 @@ + fi + + +-if test -z "${HAVE_LINUX_2_6}"; then ++if test -z "${HAVE_LINUX_2_6}"; then : + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +@@ -26663,52 +18947,69 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +- { { echo "$as_me:$LINENO: error: required Linux 2.6.x kernel headers and/or build not found." >&5 +-echo "$as_me: error: required Linux 2.6.x kernel headers and/or build not found." >&2;} +- { (exit 1); exit 1; }; } +-fi +- ++ as_fn_error "required Linux 2.6.x kernel headers and/or build not found." "$LINENO" 5 ++fi + + # Module install dir + +-echo "$as_me:$LINENO: checking directory to install kernel modules" >&5 +-echo $ECHO_N "checking directory to install kernel modules... $ECHO_C" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking directory to install kernel modules" >&5 ++$as_echo_n "checking directory to install kernel modules... " >&6; } + if test -n "${CR_MODULE_DIR}"; then + cr_why='passed via --with-kmod-dir' + elif test ${sysconfdir} = /etc; then +@@ -26718,16 +19019,16 @@ + CR_MODULE_DIR="${libdir}/${PACKAGE}/${LINUX_VER}" + cr_why='default' + fi +-echo "$as_me:$LINENO: result: ${CR_MODULE_DIR} ($cr_why)" >&5 +-echo "${ECHO_T}${CR_MODULE_DIR} ($cr_why)" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${CR_MODULE_DIR} ($cr_why)" >&5 ++$as_echo "${CR_MODULE_DIR} ($cr_why)" >&6; } + + # Configure automake/kbuild glue + + +- echo "$as_me:$LINENO: checking for parameters to interface GNU automake with Linux kbuild" >&5 +-echo $ECHO_N "checking for parameters to interface GNU automake with Linux kbuild... $ECHO_C" >&6 +-if test "${cr_cv_KBUILD_MAKE_ARGS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for parameters to interface GNU automake with Linux kbuild" >&5 ++$as_echo_n "checking for parameters to interface GNU automake with Linux kbuild... " >&6; } ++if test "${cr_cv_KBUILD_MAKE_ARGS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + if grep KBUILD_EXTMOD ${LINUX_SRC}/Makefile >/dev/null 2>/dev/null; then +@@ -26746,8 +19047,8 @@ + fi + + fi +-echo "$as_me:$LINENO: result: $cr_cv_KBUILD_MAKE_ARGS" >&5 +-echo "${ECHO_T}$cr_cv_KBUILD_MAKE_ARGS" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_KBUILD_MAKE_ARGS" >&5 ++$as_echo "$cr_cv_KBUILD_MAKE_ARGS" >&6; } + KBUILD_MAKE_ARGS="$cr_cv_KBUILD_MAKE_ARGS" + # Note: we'll actually try the result in CR_SET_KCFLAGS + +@@ -26779,10 +19080,10 @@ + + + +- echo "$as_me:$LINENO: checking for flags to compile Linux kernel probes" >&5 +-echo $ECHO_N "checking for flags to compile Linux kernel probes... $ECHO_C" >&6 +-if test "${cr_cv_kconfig_kcflags+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flags to compile Linux kernel probes" >&5 ++$as_echo_n "checking for flags to compile Linux kernel probes... " >&6; } ++if test "${cr_cv_kconfig_kcflags+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + rm -rf conftestdir +@@ -26796,31 +19097,29 @@ + if test $? = 0; then cr_tmp=`grep -m1 conftest\\.c conftestdir/output | sed -e "s:^[ ]*${KCC}::"`; fi + cat conftestdir/output >&5 + if test "${cr_tmp:+OK}" != OK; then +- echo "$as_me:$LINENO: result: FAILED" >&5 +-echo "${ECHO_T}FAILED" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED" >&5 ++$as_echo "FAILED" >&6; } + cat conftestdir/output + if $EGREP 'include/(asm|linux)/[a-zA-Z0-9_-]+\.h:' conftestdir/output >/dev/null 2>&1; then +- { echo "$as_me:$LINENO: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&5 +-echo "$as_me: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&5 ++$as_echo "$as_me: WARNING: Apparent compilation problem in ${LINUX_SRC}" >&2;} + ver=`$KCC --version | head -1` +- { echo "$as_me:$LINENO: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&5 +-echo "$as_me: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&5 ++$as_echo "$as_me: WARNING: Perhaps KCC='$KCC' ($ver) is not compatible with this kernel source" >&2;} + if test $cr_wordsize -gt $ac_cv_sizeof_void_p; then + echo "$KCC" | grep -e '-m64' >/dev/null 2>/dev/null + if test $? != 0; then +- { echo "$as_me:$LINENO: WARNING: You might try setting KCC='$KCC -m64'" >&5 +-echo "$as_me: WARNING: You might try setting KCC='$KCC -m64'" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You might try setting KCC='$KCC -m64'" >&5 ++$as_echo "$as_me: WARNING: You might try setting KCC='$KCC -m64'" >&2;} + fi + fi + fi + if grep -i 'permission denied' conftestdir/output >/dev/null 2>&1; then +- { echo "$as_me:$LINENO: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&5 +-echo "$as_me: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&5 ++$as_echo "$as_me: WARNING: Apparent permissions problem in ${LINUX_SRC}" >&2;} + fi + rm -rf conftestdir +- { { echo "$as_me:$LINENO: error: Failed test run of kernel make/kbuild failed (see above)" >&5 +-echo "$as_me: error: Failed test run of kernel make/kbuild failed (see above)" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Failed test run of kernel make/kbuild failed (see above)" "$LINENO" 5 + fi + rm -rf conftestdir + cr_cv_kconfig_kcflags='' +@@ -26856,8 +19155,8 @@ + cr_cv_kconfig_kcflags="$cr_cv_kconfig_kcflags $arg" + done + fi +-echo "$as_me:$LINENO: result: $cr_cv_kconfig_kcflags" >&5 +-echo "${ECHO_T}$cr_cv_kconfig_kcflags" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_kconfig_kcflags" >&5 ++$as_echo "$cr_cv_kconfig_kcflags" >&6; } + KCFLAGS="$cr_cv_kconfig_kcflags" + # Do these init steps early, in case first CR_FIND_KSYM is a conditional call + +@@ -26867,17 +19166,15 @@ + # Checks for matching (we hope) symbol table + + +- echo "$as_me:$LINENO: checking for Linux kernel symbol table" >&5 +-echo $ECHO_N "checking for Linux kernel symbol table... $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kernel symbol table" >&5 ++$as_echo_n "checking for Linux kernel symbol table... " >&6; } + + + + + if test "${LINUX_SYSTEM_MAP+set}${cr_cv_var_LINUX_SYSTEM_MAP+set}" = setset; then + if test "$LINUX_SYSTEM_MAP" != "$cr_cv_var_LINUX_SYSTEM_MAP"; then +- { { echo "$as_me:$LINENO: error: Cached LINUX_SYSTEM_MAP ($cr_cv_var_LINUX_SYSTEM_MAP) does not match current value ($LINUX_SYSTEM_MAP). Remove '$cache_file' before re-running configure." >&5 +-echo "$as_me: error: Cached LINUX_SYSTEM_MAP ($cr_cv_var_LINUX_SYSTEM_MAP) does not match current value ($LINUX_SYSTEM_MAP). Remove '$cache_file' before re-running configure." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Cached LINUX_SYSTEM_MAP ($cr_cv_var_LINUX_SYSTEM_MAP) does not match current value ($LINUX_SYSTEM_MAP). Remove '$cache_file' before re-running configure." "$LINENO" 5 + fi + elif test "${cr_cv_var_LINUX_SYSTEM_MAP+set}" = set; then + LINUX_SYSTEM_MAP="$cr_cv_var_LINUX_SYSTEM_MAP" +@@ -26886,9 +19183,7 @@ + + if test "${LINUX_VMLINUX+set}${cr_cv_var_LINUX_VMLINUX+set}" = setset; then + if test "$LINUX_VMLINUX" != "$cr_cv_var_LINUX_VMLINUX"; then +- { { echo "$as_me:$LINENO: error: Cached LINUX_VMLINUX ($cr_cv_var_LINUX_VMLINUX) does not match current value ($LINUX_VMLINUX). Remove '$cache_file' before re-running configure." >&5 +-echo "$as_me: error: Cached LINUX_VMLINUX ($cr_cv_var_LINUX_VMLINUX) does not match current value ($LINUX_VMLINUX). Remove '$cache_file' before re-running configure." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Cached LINUX_VMLINUX ($cr_cv_var_LINUX_VMLINUX) does not match current value ($LINUX_VMLINUX). Remove '$cache_file' before re-running configure." "$LINENO" 5 + fi + elif test "${cr_cv_var_LINUX_VMLINUX+set}" = set; then + LINUX_VMLINUX="$cr_cv_var_LINUX_VMLINUX" +@@ -26898,7 +19193,7 @@ + # First try validating the user's (or cached) selection + if test -n "$LINUX_SYSTEM_MAP" ; then + +- if test -n ""$LINUX_SYSTEM_MAP"" -a -r ""$LINUX_SYSTEM_MAP"" && grep ' [AB] _end' <""$LINUX_SYSTEM_MAP"" >/dev/null 2>/dev/null; then ++ if test -n ""$LINUX_SYSTEM_MAP"" -a -r ""$LINUX_SYSTEM_MAP"" && grep -e '[TD] sys_open' -e '[AB] _end' <""$LINUX_SYSTEM_MAP"" >/dev/null 2>/dev/null; then + if grep -B1 '[AB] _end' <""$LINUX_SYSTEM_MAP"" | grep _stext >/dev/null 2>/dev/null; then + # Reject "stripped" files (such as in FC2) + # Recognized (poorly) by _stext and _end as last two entries. +@@ -26912,17 +19207,15 @@ + + if test -z "$LINUX_SYMTAB_CMD"; then + # The user specified a file, but we can't use it. Abort. +- echo "$as_me:$LINENO: result: failed" >&5 +-echo "${ECHO_T}failed" >&6 +- { { echo "$as_me:$LINENO: error: Failed to validate \"$LINUX_SYSTEM_MAP\"" >&5 +-echo "$as_me: error: Failed to validate \"$LINUX_SYSTEM_MAP\"" >&2;} +- { (exit 1); exit 1; }; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 ++$as_echo "failed" >&6; } ++ as_fn_error "Failed to validate \"$LINUX_SYSTEM_MAP\"" "$LINENO" 5 + fi + fi + if test -z "$LINUX_SYMTAB_CMD" -a -n "$LINUX_VMLINUX" ; then + + +- if test -n ""$LINUX_VMLINUX"" -a -r ""$LINUX_VMLINUX"" && ($NM ""$LINUX_VMLINUX"" | grep ' [AB] _end') >/dev/null 2>/dev/null; then ++ if test -n ""$LINUX_VMLINUX"" -a -r ""$LINUX_VMLINUX"" && ($NM ""$LINUX_VMLINUX"" | grep -e '[TD] sys_open' -e '[AB] _end') >/dev/null 2>/dev/null; then + LINUX_VMLINUX=""$LINUX_VMLINUX"" + LINUX_SYMTAB_FILE=""$LINUX_VMLINUX"" + LINUX_SYMTAB_CMD="$NM "$LINUX_VMLINUX" 2>/dev/null" +@@ -26930,11 +19223,9 @@ + + if test -z "$LINUX_SYMTAB_CMD"; then + # The user specified a file, but we can't use it. Abort. +- echo "$as_me:$LINENO: result: failed" >&5 +-echo "${ECHO_T}failed" >&6 +- { { echo "$as_me:$LINENO: error: Failed to validate \"$LINUX_VMLINUX\"" >&5 +-echo "$as_me: error: Failed to validate \"$LINUX_VMLINUX\"" >&2;} +- { (exit 1); exit 1; }; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 ++$as_echo "failed" >&6; } ++ as_fn_error "Failed to validate \"$LINUX_VMLINUX\"" "$LINENO" 5 + fi + fi + # Next try searching for System.map or vmlinux in standard locations +@@ -26950,7 +19241,7 @@ + # Try System.map in the given location + cr_file=`echo $cr_file_pattern | sed -e 's|@|System.map|'` + +- if test -n "$cr_file" -a -r "$cr_file" && grep ' [AB] _end' <"$cr_file" >/dev/null 2>/dev/null; then ++ if test -n "$cr_file" -a -r "$cr_file" && grep -e '[TD] sys_open' -e '[AB] _end' <"$cr_file" >/dev/null 2>/dev/null; then + if grep -B1 '[AB] _end' <"$cr_file" | grep _stext >/dev/null 2>/dev/null; then + # Reject "stripped" files (such as in FC2) + # Recognized (poorly) by _stext and _end as last two entries. +@@ -26969,7 +19260,7 @@ + cr_file=`echo $cr_file_pattern | sed -e 's|@|vmlinux|'` + + +- if test -n "$cr_file" -a -r "$cr_file" && ($NM "$cr_file" | grep ' [AB] _end') >/dev/null 2>/dev/null; then ++ if test -n "$cr_file" -a -r "$cr_file" && ($NM "$cr_file" | grep -e '[TD] sys_open' -e '[AB] _end') >/dev/null 2>/dev/null; then + LINUX_VMLINUX="$cr_file" + LINUX_SYMTAB_FILE="$cr_file" + LINUX_SYMTAB_CMD="$NM $cr_file 2>/dev/null" +@@ -26983,8 +19274,8 @@ + # Announce our result + if test -z "$LINUX_SYMTAB_CMD"; then + LINUX_SYMTAB_CMD="true" +- echo "$as_me:$LINENO: result: failed" >&5 +-echo "${ECHO_T}failed" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 ++$as_echo "failed" >&6; } + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +@@ -27003,56 +19294,72 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache + if test -n "$cr_stripped_maps"; then +- { echo "$as_me:$LINENO: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&5 +-echo "$as_me: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&2;} +- { { echo "$as_me:$LINENO: error: Failed to locate kernel symbol table. Try installing the kernel-debuginfo package matching your kernel, or using --with-system-map or --with-vmlinux." >&5 +-echo "$as_me: error: Failed to locate kernel symbol table. Try installing the kernel-debuginfo package matching your kernel, or using --with-system-map or --with-vmlinux." >&2;} +- { (exit 1); exit 1; }; } +- else +- { { echo "$as_me:$LINENO: error: Failed to locate kernel symbol table. Try using --with-system-map or --with-vmlinux." >&5 +-echo "$as_me: error: Failed to locate kernel symbol table. Try using --with-system-map or --with-vmlinux." >&2;} +- { (exit 1); exit 1; }; } +- fi +- else +- echo "$as_me:$LINENO: result: $LINUX_SYMTAB_FILE" >&5 +-echo "${ECHO_T}$LINUX_SYMTAB_FILE" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&5 ++$as_echo "$as_me: WARNING: Skipped stripped System.map file(s): $cr_stripped_maps" >&2;} ++ as_fn_error "Failed to locate kernel symbol table. Try installing the kernel-debuginfo package matching your kernel, or using --with-system-map or --with-vmlinux." "$LINENO" 5 ++ else ++ as_fn_error "Failed to locate kernel symbol table. Try using --with-system-map or --with-vmlinux." "$LINENO" 5 ++ fi ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_SYMTAB_FILE" >&5 ++$as_echo "$LINUX_SYMTAB_FILE" >&6; } + test -n "$LINUX_SYSTEM_MAP" && cr_cv_var_LINUX_SYSTEM_MAP="$LINUX_SYSTEM_MAP" + test -n "$LINUX_VMLINUX" && cr_cv_var_LINUX_VMLINUX="$LINUX_VMLINUX" + +@@ -27062,8 +19369,8 @@ + : # OK - either not caching or cached version still matches + else + if test -f .cached_ksymtab; then +- { echo "$as_me:$LINENO: WARNING: kernel symbol table has changed... discarding cached results." >&5 +-echo "$as_me: WARNING: kernel symbol table has changed... discarding cached results." >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: kernel symbol table has changed... discarding cached results." >&5 ++$as_echo "$as_me: WARNING: kernel symbol table has changed... discarding cached results." >&2;} + rm -f .cached_ksymtab + fi + for cr_var in cr_cv_ksymtab__NON_EMPTY_HACK `(set) | grep "^cr_cv_ksymtab_" | cut -d= -f1`; do +@@ -27075,26 +19382,22 @@ + fi + # Now check for consistency w/ the kernel source + # XXX: Currently just check SMPness. Can this be more aggressive? +- echo "$as_me:$LINENO: checking for SMP kernel source" >&5 +-echo $ECHO_N "checking for SMP kernel source... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_smp_source+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMP kernel source" >&5 ++$as_echo_n "checking for SMP kernel source... " >&6; } ++ ++ if test "${cr_cv_kconfig_smp_source+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -27116,42 +19419,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_smp_source=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_smp_source=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -27165,17 +19444,17 @@ + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6; ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; }; + cr_kernel_smp=$cr_result +- echo "$as_me:$LINENO: checking for SMP kernel symbol table" >&5 +-echo $ECHO_N "checking for SMP kernel symbol table... $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMP kernel symbol table" >&5 ++$as_echo_n "checking for SMP kernel symbol table... " >&6; } + cr_symtab_smp=no + if test -n "`eval $LINUX_SYMTAB_CMD | grep del_timer_sync 2>/dev/null`"; then + cr_symtab_smp=yes + fi +- echo "$as_me:$LINENO: result: $cr_symtab_smp" >&5 +-echo "${ECHO_T}$cr_symtab_smp" >&6; ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_symtab_smp" >&5 ++$as_echo "$cr_symtab_smp" >&6; }; + if test "$cr_kernel_smp" != "$cr_symtab_smp"; then + + echo "======================================================================" +@@ -27188,42 +19467,53 @@ + echo "======================================================================" + + if test "$cr_kernel_smp" = yes; then +- { { echo "$as_me:$LINENO: error: Kernel source is configured SMP but the kernel symbol table is not. Consider specifying a symbol table with --with-system-map or --with-vmlinux. Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=UP to force a uni-processor interpretation of the sources." >&5 +-echo "$as_me: error: Kernel source is configured SMP but the kernel symbol table is not. Consider specifying a symbol table with --with-system-map or --with-vmlinux. Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=UP to force a uni-processor interpretation of the sources." >&2;} +- { (exit 1); exit 1; }; } +- else +- { { echo "$as_me:$LINENO: error: Kernel source is configured uni-processor but the kernel symbol table is SMP. Consider specifying a symbol table with --with-system-map or --with-vmlinux. Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=SMP to force an SMP interpretation of the sources." >&5 +-echo "$as_me: error: Kernel source is configured uni-processor but the kernel symbol table is SMP. Consider specifying a symbol table with --with-system-map or --with-vmlinux. Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=SMP to force an SMP interpretation of the sources." >&2;} +- { (exit 1); exit 1; }; } +- fi +- fi ++ as_fn_error "Kernel source is configured SMP but the kernel symbol table is not. Consider specifying a symbol table with --with-system-map or --with-vmlinux. Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=UP to force a uni-processor interpretation of the sources." "$LINENO" 5 ++ else ++ as_fn_error "Kernel source is configured uni-processor but the kernel symbol table is SMP. Consider specifying a symbol table with --with-system-map or --with-vmlinux. Or, if using kernel sources that are configured by /boot/kernel.h, you may try --with-kernel-type=SMP to force an SMP interpretation of the sources." "$LINENO" 5 ++ fi ++ fi ++ ++ ++# Set and substitute CR_KARCH to enable i386 userland on x86_64 kernels ++CR_KARCH=$CR_ARCH ++if test $CR_ARCH = i386; then ++ # probe the System.map to find out if we need to change CR_KARCH at all. ++ # All this does is count the number of *digits* in a hex formatted address ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Testing if KARCH is the same as ARCH" >&5 ++$as_echo "$as_me: Testing if KARCH is the same as ARCH" >&6;} ++ symlen=`$LINUX_SYMTAB_CMD | head -n1 | sed 's/ .*$//;s/\(.\)/\1\n/g;s/\n$//'|wc -l` ++ if test $symlen -eq 16; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Changing KARCH to x86_64" >&5 ++$as_echo "$as_me: Changing KARCH to x86_64" >&6;} ++ CR_KARCH=x86_64 ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Not touching KARCH" >&5 ++$as_echo "$as_me: Not touching KARCH" >&6;} ++ fi ++fi ++CR_KARCH=$CR_KARCH + + + ## Check for optional kernel headers... + + + +- +- echo "$as_me:$LINENO: checking kernel for linux/syscalls.h" >&5 +-echo $ECHO_N "checking kernel for linux/syscalls.h... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/syscalls.h" >&5 ++$as_echo_n "checking kernel for linux/syscalls.h... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -27243,42 +19533,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -27286,48 +19552,39 @@ + cr_result=$cr_cv_kconfig_HAVE_LINUX_SYSCALLS_H + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_SYSCALLS_H 1 +-_ACEOF ++ $as_echo "#define HAVE_LINUX_SYSCALLS_H 1" >>confdefs.h + + HAVE_LINUX_SYSCALLS_H=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_SYSCALLS_H 0 +-_ACEOF ++ $as_echo "#define HAVE_LINUX_SYSCALLS_H 0" >>confdefs.h + + HAVE_LINUX_SYSCALLS_H='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for linux/pspace.h" >&5 +-echo $ECHO_N "checking kernel for linux/pspace.h... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_LINUX_PSPACE_H+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/pspace.h" >&5 ++$as_echo_n "checking kernel for linux/pspace.h... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_LINUX_PSPACE_H+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -27347,42 +19604,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_LINUX_PSPACE_H=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_LINUX_PSPACE_H=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -27390,48 +19623,39 @@ + cr_result=$cr_cv_kconfig_HAVE_LINUX_PSPACE_H + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_PSPACE_H 1 +-_ACEOF ++ $as_echo "#define HAVE_LINUX_PSPACE_H 1" >>confdefs.h + + HAVE_LINUX_PSPACE_H=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_PSPACE_H 0 +-_ACEOF ++ $as_echo "#define HAVE_LINUX_PSPACE_H 0" >>confdefs.h + + HAVE_LINUX_PSPACE_H='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for linux/pid_namespace.h" >&5 +-echo $ECHO_N "checking kernel for linux/pid_namespace.h... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/pid_namespace.h" >&5 ++$as_echo_n "checking kernel for linux/pid_namespace.h... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -27451,42 +19675,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -27494,48 +19694,39 @@ + cr_result=$cr_cv_kconfig_HAVE_LINUX_PID_NAMESPACE_H + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_PID_NAMESPACE_H 1 +-_ACEOF ++ $as_echo "#define HAVE_LINUX_PID_NAMESPACE_H 1" >>confdefs.h + + HAVE_LINUX_PID_NAMESPACE_H=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_PID_NAMESPACE_H 0 +-_ACEOF ++ $as_echo "#define HAVE_LINUX_PID_NAMESPACE_H 0" >>confdefs.h + + HAVE_LINUX_PID_NAMESPACE_H='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for linux/lockdep.h" >&5 +-echo $ECHO_N "checking kernel for linux/lockdep.h... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/lockdep.h" >&5 ++$as_echo_n "checking kernel for linux/lockdep.h... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -27555,42 +19746,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -27598,48 +19765,39 @@ + cr_result=$cr_cv_kconfig_HAVE_LINUX_LOCKDEP_H + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_LOCKDEP_H 1 +-_ACEOF ++ $as_echo "#define HAVE_LINUX_LOCKDEP_H 1" >>confdefs.h + + HAVE_LINUX_LOCKDEP_H=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_LOCKDEP_H 0 +-_ACEOF ++ $as_echo "#define HAVE_LINUX_LOCKDEP_H 0" >>confdefs.h + + HAVE_LINUX_LOCKDEP_H='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for linux/compile.h" >&5 +-echo $ECHO_N "checking kernel for linux/compile.h... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_LINUX_COMPILE_H+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/compile.h" >&5 ++$as_echo_n "checking kernel for linux/compile.h... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_LINUX_COMPILE_H+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -27659,42 +19817,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_LINUX_COMPILE_H=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_LINUX_COMPILE_H=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -27702,48 +19836,39 @@ + cr_result=$cr_cv_kconfig_HAVE_LINUX_COMPILE_H + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_COMPILE_H 1 +-_ACEOF ++ $as_echo "#define HAVE_LINUX_COMPILE_H 1" >>confdefs.h + + HAVE_LINUX_COMPILE_H=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_COMPILE_H 0 +-_ACEOF ++ $as_echo "#define HAVE_LINUX_COMPILE_H 0" >>confdefs.h + + HAVE_LINUX_COMPILE_H='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for linux/fdtable.h" >&5 +-echo $ECHO_N "checking kernel for linux/fdtable.h... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_LINUX_FDTABLE_H+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/fdtable.h" >&5 ++$as_echo_n "checking kernel for linux/fdtable.h... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_LINUX_FDTABLE_H+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -27763,42 +19888,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_LINUX_FDTABLE_H=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_LINUX_FDTABLE_H=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -27806,48 +19907,39 @@ + cr_result=$cr_cv_kconfig_HAVE_LINUX_FDTABLE_H + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_FDTABLE_H 1 +-_ACEOF ++ $as_echo "#define HAVE_LINUX_FDTABLE_H 1" >>confdefs.h + + HAVE_LINUX_FDTABLE_H=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_FDTABLE_H 0 +-_ACEOF ++ $as_echo "#define HAVE_LINUX_FDTABLE_H 0" >>confdefs.h + + HAVE_LINUX_FDTABLE_H='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for linux/utrace.h" >&5 +-echo $ECHO_N "checking kernel for linux/utrace.h... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_LINUX_UTRACE_H+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for linux/utrace.h" >&5 ++$as_echo_n "checking kernel for linux/utrace.h... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_LINUX_UTRACE_H+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -27867,42 +19959,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_LINUX_UTRACE_H=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_LINUX_UTRACE_H=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -27910,48 +19978,39 @@ + cr_result=$cr_cv_kconfig_HAVE_LINUX_UTRACE_H + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_UTRACE_H 1 +-_ACEOF ++ $as_echo "#define HAVE_LINUX_UTRACE_H 1" >>confdefs.h + + HAVE_LINUX_UTRACE_H=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_UTRACE_H 0 +-_ACEOF ++ $as_echo "#define HAVE_LINUX_UTRACE_H 0" >>confdefs.h + + HAVE_LINUX_UTRACE_H='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for asm/elf.h" >&5 +-echo $ECHO_N "checking kernel for asm/elf.h... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_ASM_ELF_H+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for asm/elf.h" >&5 ++$as_echo_n "checking kernel for asm/elf.h... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_ASM_ELF_H+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -27971,42 +20030,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_ASM_ELF_H=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_ASM_ELF_H=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -28014,48 +20049,39 @@ + cr_result=$cr_cv_kconfig_HAVE_ASM_ELF_H + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_ASM_ELF_H 1 +-_ACEOF ++ $as_echo "#define HAVE_ASM_ELF_H 1" >>confdefs.h + + HAVE_ASM_ELF_H=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_ASM_ELF_H 0 +-_ACEOF ++ $as_echo "#define HAVE_ASM_ELF_H 0" >>confdefs.h + + HAVE_ASM_ELF_H='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for asm/desc.h" >&5 +-echo $ECHO_N "checking kernel for asm/desc.h... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_ASM_DESC_H+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for asm/desc.h" >&5 ++$as_echo_n "checking kernel for asm/desc.h... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_ASM_DESC_H+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -28075,42 +20101,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_ASM_DESC_H=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_ASM_DESC_H=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -28118,48 +20120,39 @@ + cr_result=$cr_cv_kconfig_HAVE_ASM_DESC_H + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_ASM_DESC_H 1 +-_ACEOF ++ $as_echo "#define HAVE_ASM_DESC_H 1" >>confdefs.h + + HAVE_ASM_DESC_H=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_ASM_DESC_H 0 +-_ACEOF ++ $as_echo "#define HAVE_ASM_DESC_H 0" >>confdefs.h + + HAVE_ASM_DESC_H='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for asm/vsyscall32.h" >&5 +-echo $ECHO_N "checking kernel for asm/vsyscall32.h... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for asm/vsyscall32.h" >&5 ++$as_echo_n "checking kernel for asm/vsyscall32.h... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -28179,42 +20172,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -28222,48 +20191,39 @@ + cr_result=$cr_cv_kconfig_HAVE_ASM_VSYSCALL32_H + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_ASM_VSYSCALL32_H 1 +-_ACEOF ++ $as_echo "#define HAVE_ASM_VSYSCALL32_H 1" >>confdefs.h + + HAVE_ASM_VSYSCALL32_H=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_ASM_VSYSCALL32_H 0 +-_ACEOF ++ $as_echo "#define HAVE_ASM_VSYSCALL32_H 0" >>confdefs.h + + HAVE_ASM_VSYSCALL32_H='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for asm/i387.h" >&5 +-echo $ECHO_N "checking kernel for asm/i387.h... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_ASM_I387_H+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for asm/i387.h" >&5 ++$as_echo_n "checking kernel for asm/i387.h... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_ASM_I387_H+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -28283,42 +20243,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_ASM_I387_H=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_ASM_I387_H=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -28326,22 +20262,18 @@ + cr_result=$cr_cv_kconfig_HAVE_ASM_I387_H + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_ASM_I387_H 1 +-_ACEOF ++ $as_echo "#define HAVE_ASM_I387_H 1" >>confdefs.h + + HAVE_ASM_I387_H=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_ASM_I387_H 0 +-_ACEOF ++ $as_echo "#define HAVE_ASM_I387_H 0" >>confdefs.h + + HAVE_ASM_I387_H='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + +@@ -28349,12 +20281,12 @@ + + + +- echo "$as_me:$LINENO: checking kernel symbol table for timeval_to_jiffies" >&5 +-echo $ECHO_N "checking kernel symbol table for timeval_to_jiffies... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_timeval_to_jiffies+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for timeval_to_jiffies" >&5 ++$as_echo_n "checking kernel symbol table for timeval_to_jiffies... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_timeval_to_jiffies+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_timeval_to_jiffies=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}timeval_to_jiffies$/ {s/ .*//p;q;}"` +@@ -28370,11 +20302,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -28394,42 +20322,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_timeval_to_jiffies="Y$cr_cv_ksymtab_timeval_to_jiffies" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_timeval_to_jiffies="N$cr_cv_ksymtab_timeval_to_jiffies" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -28440,9 +20344,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_timeval_to_jiffies" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol timeval_to_jiffies but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol timeval_to_jiffies but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol timeval_to_jiffies but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_timeval_to_jiffies | tr -d 'YN'` + if test $cr_result = 0; then +@@ -28458,17 +20360,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for jiffies_to_timeval" >&5 +-echo $ECHO_N "checking kernel symbol table for jiffies_to_timeval... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_jiffies_to_timeval+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for jiffies_to_timeval" >&5 ++$as_echo_n "checking kernel symbol table for jiffies_to_timeval... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_jiffies_to_timeval+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_jiffies_to_timeval=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}jiffies_to_timeval$/ {s/ .*//p;q;}"` +@@ -28484,11 +20386,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -28508,42 +20406,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_jiffies_to_timeval="Y$cr_cv_ksymtab_jiffies_to_timeval" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_jiffies_to_timeval="N$cr_cv_ksymtab_jiffies_to_timeval" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -28554,9 +20428,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_jiffies_to_timeval" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol jiffies_to_timeval but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol jiffies_to_timeval but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol jiffies_to_timeval but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_jiffies_to_timeval | tr -d 'YN'` + if test $cr_result = 0; then +@@ -28572,34 +20444,29 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for struct fdtable" >&5 +-echo $ECHO_N "checking kernel for struct fdtable... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_STRUCT_FDTABLE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct fdtable" >&5 ++$as_echo_n "checking kernel for struct fdtable... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_STRUCT_FDTABLE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -28625,42 +20492,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_STRUCT_FDTABLE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_STRUCT_FDTABLE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -28668,22 +20511,18 @@ + cr_result=$cr_cv_kconfig_HAVE_STRUCT_FDTABLE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRUCT_FDTABLE 1 +-_ACEOF ++ $as_echo "#define HAVE_STRUCT_FDTABLE 1" >>confdefs.h + + HAVE_STRUCT_FDTABLE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRUCT_FDTABLE 0 +-_ACEOF ++ $as_echo "#define HAVE_STRUCT_FDTABLE 0" >>confdefs.h + + HAVE_STRUCT_FDTABLE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # OK if missing +@@ -28691,27 +20530,22 @@ + + + +- +- echo "$as_me:$LINENO: checking kernel for files_struct.next_fd" >&5 +-echo $ECHO_N "checking kernel for files_struct.next_fd... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for files_struct.next_fd" >&5 ++$as_echo_n "checking kernel for files_struct.next_fd... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -28735,42 +20569,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -28778,48 +20588,39 @@ + cr_result=$cr_cv_kconfig_HAVE_FILES_STRUCT_NEXT_FD + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FILES_STRUCT_NEXT_FD 1 +-_ACEOF ++ $as_echo "#define HAVE_FILES_STRUCT_NEXT_FD 1" >>confdefs.h + + HAVE_FILES_STRUCT_NEXT_FD=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FILES_STRUCT_NEXT_FD 0 +-_ACEOF ++ $as_echo "#define HAVE_FILES_STRUCT_NEXT_FD 0" >>confdefs.h + + HAVE_FILES_STRUCT_NEXT_FD='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for fdtable.next_fd" >&5 +-echo $ECHO_N "checking kernel for fdtable.next_fd... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for fdtable.next_fd" >&5 ++$as_echo_n "checking kernel for fdtable.next_fd... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -28843,42 +20644,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -28886,22 +20663,18 @@ + cr_result=$cr_cv_kconfig_HAVE_FDTABLE_NEXT_FD + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FDTABLE_NEXT_FD 1 +-_ACEOF ++ $as_echo "#define HAVE_FDTABLE_NEXT_FD 1" >>confdefs.h + + HAVE_FDTABLE_NEXT_FD=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FDTABLE_NEXT_FD 0 +-_ACEOF ++ $as_echo "#define HAVE_FDTABLE_NEXT_FD 0" >>confdefs.h + + HAVE_FDTABLE_NEXT_FD='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # Allow only exactly one match +@@ -28925,39 +20698,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -28971,36 +20764,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine where to find next_fd" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine where to find next_fd" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for files_struct.max_fdset" >&5 +-echo $ECHO_N "checking kernel for files_struct.max_fdset... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine where to find next_fd" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for files_struct.max_fdset" >&5 ++$as_echo_n "checking kernel for files_struct.max_fdset... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -29024,42 +20810,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -29067,49 +20829,40 @@ + cr_result=$cr_cv_kconfig_HAVE_FILES_STRUCT_MAX_FDSET + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FILES_STRUCT_MAX_FDSET 1 +-_ACEOF ++ $as_echo "#define HAVE_FILES_STRUCT_MAX_FDSET 1" >>confdefs.h + + HAVE_FILES_STRUCT_MAX_FDSET=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FILES_STRUCT_MAX_FDSET 0 +-_ACEOF ++ $as_echo "#define HAVE_FILES_STRUCT_MAX_FDSET 0" >>confdefs.h + + HAVE_FILES_STRUCT_MAX_FDSET='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for struct path" >&5 +-echo $ECHO_N "checking kernel for struct path... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_STRUCT_PATH+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct path" >&5 ++$as_echo_n "checking kernel for struct path... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_STRUCT_PATH+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -29129,42 +20882,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_STRUCT_PATH=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_STRUCT_PATH=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -29172,47 +20901,38 @@ + cr_result=$cr_cv_kconfig_HAVE_STRUCT_PATH + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRUCT_PATH 1 +-_ACEOF ++ $as_echo "#define HAVE_STRUCT_PATH 1" >>confdefs.h + + HAVE_STRUCT_PATH=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRUCT_PATH 0 +-_ACEOF ++ $as_echo "#define HAVE_STRUCT_PATH 0" >>confdefs.h + + HAVE_STRUCT_PATH='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for nameidata.path" >&5 +-echo $ECHO_N "checking kernel for nameidata.path... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_NAMEIDATA_PATH+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for nameidata.path" >&5 ++$as_echo_n "checking kernel for nameidata.path... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_NAMEIDATA_PATH+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -29247,42 +20967,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_NAMEIDATA_PATH=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_NAMEIDATA_PATH=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -29290,46 +20986,37 @@ + cr_result=$cr_cv_kconfig_HAVE_NAMEIDATA_PATH + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_NAMEIDATA_PATH 1 +-_ACEOF ++ $as_echo "#define HAVE_NAMEIDATA_PATH 1" >>confdefs.h + + HAVE_NAMEIDATA_PATH=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_NAMEIDATA_PATH 0 +-_ACEOF ++ $as_echo "#define HAVE_NAMEIDATA_PATH 0" >>confdefs.h + + HAVE_NAMEIDATA_PATH='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for nameidata.dentry" >&5 +-echo $ECHO_N "checking kernel for nameidata.dentry... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for nameidata.dentry" >&5 ++$as_echo_n "checking kernel for nameidata.dentry... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -29364,42 +21051,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -29407,22 +21070,18 @@ + cr_result=$cr_cv_kconfig_HAVE_NAMEIDATA_DENTRY + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_NAMEIDATA_DENTRY 1 +-_ACEOF ++ $as_echo "#define HAVE_NAMEIDATA_DENTRY 1" >>confdefs.h + + HAVE_NAMEIDATA_DENTRY=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_NAMEIDATA_DENTRY 0 +-_ACEOF ++ $as_echo "#define HAVE_NAMEIDATA_DENTRY 0" >>confdefs.h + + HAVE_NAMEIDATA_DENTRY='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + if test "${HAVE_NAMEIDATA_PATH}${HAVE_NAMEIDATA_DENTRY}" != "1"; then + +@@ -29444,39 +21103,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -29490,36 +21169,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine composition of struct nameidata" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine composition of struct nameidata" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for __putname" >&5 +-echo $ECHO_N "checking kernel for __putname... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE___PUTNAME+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine composition of struct nameidata" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for __putname" >&5 ++$as_echo_n "checking kernel for __putname... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE___PUTNAME+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -29543,42 +21215,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE___PUTNAME=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE___PUTNAME=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -29586,49 +21234,40 @@ + cr_result=$cr_cv_kconfig_HAVE___PUTNAME + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE___PUTNAME 1 +-_ACEOF ++ $as_echo "#define HAVE___PUTNAME 1" >>confdefs.h + + HAVE___PUTNAME=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE___PUTNAME 0 +-_ACEOF ++ $as_echo "#define HAVE___PUTNAME 0" >>confdefs.h + + HAVE___PUTNAME='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for struct delayed_work" >&5 +-echo $ECHO_N "checking kernel for struct delayed_work... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct delayed_work" >&5 ++$as_echo_n "checking kernel for struct delayed_work... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -29648,42 +21287,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -29691,22 +21306,18 @@ + cr_result=$cr_cv_kconfig_HAVE_STRUCT_DELAYED_WORK + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRUCT_DELAYED_WORK 1 +-_ACEOF ++ $as_echo "#define HAVE_STRUCT_DELAYED_WORK 1" >>confdefs.h + + HAVE_STRUCT_DELAYED_WORK=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRUCT_DELAYED_WORK 0 +-_ACEOF ++ $as_echo "#define HAVE_STRUCT_DELAYED_WORK 0" >>confdefs.h + + HAVE_STRUCT_DELAYED_WORK='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + +@@ -29714,27 +21325,22 @@ + + + +- +- echo "$as_me:$LINENO: checking kernel for do_each_pid_task" >&5 +-echo $ECHO_N "checking kernel for do_each_pid_task... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_DO_EACH_PID_TASK+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for do_each_pid_task" >&5 ++$as_echo_n "checking kernel for do_each_pid_task... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_DO_EACH_PID_TASK+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -29755,42 +21361,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_DO_EACH_PID_TASK=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_DO_EACH_PID_TASK=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -29798,48 +21380,39 @@ + cr_result=$cr_cv_kconfig_HAVE_DO_EACH_PID_TASK + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_DO_EACH_PID_TASK 1 +-_ACEOF ++ $as_echo "#define HAVE_DO_EACH_PID_TASK 1" >>confdefs.h + + HAVE_DO_EACH_PID_TASK=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_DO_EACH_PID_TASK 0 +-_ACEOF ++ $as_echo "#define HAVE_DO_EACH_PID_TASK 0" >>confdefs.h + + HAVE_DO_EACH_PID_TASK='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for do_each_task_pid" >&5 +-echo $ECHO_N "checking kernel for do_each_task_pid... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_DO_EACH_TASK_PID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for do_each_task_pid" >&5 ++$as_echo_n "checking kernel for do_each_task_pid... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_DO_EACH_TASK_PID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -29860,42 +21433,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_DO_EACH_TASK_PID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_DO_EACH_TASK_PID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -29903,49 +21452,40 @@ + cr_result=$cr_cv_kconfig_HAVE_DO_EACH_TASK_PID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_DO_EACH_TASK_PID 1 +-_ACEOF ++ $as_echo "#define HAVE_DO_EACH_TASK_PID 1" >>confdefs.h + + HAVE_DO_EACH_TASK_PID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_DO_EACH_TASK_PID 0 +-_ACEOF ++ $as_echo "#define HAVE_DO_EACH_TASK_PID 0" >>confdefs.h + + HAVE_DO_EACH_TASK_PID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -z "${HAVE_DO_EACH_TASK_PID}"; then + + + +- +- echo "$as_me:$LINENO: checking kernel for for_each_task_pid" >&5 +-echo $ECHO_N "checking kernel for for_each_task_pid... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for for_each_task_pid" >&5 ++$as_echo_n "checking kernel for for_each_task_pid... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -29966,42 +21506,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -30009,22 +21525,18 @@ + cr_result=$cr_cv_kconfig_HAVE_FOR_EACH_TASK_PID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FOR_EACH_TASK_PID 1 +-_ACEOF ++ $as_echo "#define HAVE_FOR_EACH_TASK_PID 1" >>confdefs.h + + HAVE_FOR_EACH_TASK_PID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FOR_EACH_TASK_PID 0 +-_ACEOF ++ $as_echo "#define HAVE_FOR_EACH_TASK_PID 0" >>confdefs.h + + HAVE_FOR_EACH_TASK_PID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + fi +@@ -30049,39 +21561,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -30095,36 +21627,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to find a task iterator" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to find a task iterator" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 2.6.0 task ids" >&5 +-echo $ECHO_N "checking kernel for 2.6.0 task ids... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_2_6_0_TASK_IDS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to find a task iterator" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.0 task ids" >&5 ++$as_echo_n "checking kernel for 2.6.0 task ids... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_2_6_0_TASK_IDS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -30142,42 +21667,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_0_TASK_IDS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_0_TASK_IDS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -30185,48 +21686,39 @@ + cr_result=$cr_cv_kconfig_HAVE_2_6_0_TASK_IDS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_0_TASK_IDS 1 +-_ACEOF ++ $as_echo "#define HAVE_2_6_0_TASK_IDS 1" >>confdefs.h + + HAVE_2_6_0_TASK_IDS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_0_TASK_IDS 0 +-_ACEOF ++ $as_echo "#define HAVE_2_6_0_TASK_IDS 0" >>confdefs.h + + HAVE_2_6_0_TASK_IDS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 2.6.6 task ids" >&5 +-echo $ECHO_N "checking kernel for 2.6.6 task ids... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_2_6_6_TASK_IDS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.6 task ids" >&5 ++$as_echo_n "checking kernel for 2.6.6 task ids... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_2_6_6_TASK_IDS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -30244,42 +21736,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_6_TASK_IDS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_6_TASK_IDS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -30287,48 +21755,39 @@ + cr_result=$cr_cv_kconfig_HAVE_2_6_6_TASK_IDS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_6_TASK_IDS 1 +-_ACEOF ++ $as_echo "#define HAVE_2_6_6_TASK_IDS 1" >>confdefs.h + + HAVE_2_6_6_TASK_IDS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_6_TASK_IDS 0 +-_ACEOF ++ $as_echo "#define HAVE_2_6_6_TASK_IDS 0" >>confdefs.h + + HAVE_2_6_6_TASK_IDS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 2.6.20 task ids" >&5 +-echo $ECHO_N "checking kernel for 2.6.20 task ids... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_2_6_20_TASK_IDS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.20 task ids" >&5 ++$as_echo_n "checking kernel for 2.6.20 task ids... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_2_6_20_TASK_IDS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -30349,42 +21808,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_20_TASK_IDS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_20_TASK_IDS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -30392,48 +21827,39 @@ + cr_result=$cr_cv_kconfig_HAVE_2_6_20_TASK_IDS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_20_TASK_IDS 1 +-_ACEOF ++ $as_echo "#define HAVE_2_6_20_TASK_IDS 1" >>confdefs.h + + HAVE_2_6_20_TASK_IDS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_20_TASK_IDS 0 +-_ACEOF ++ $as_echo "#define HAVE_2_6_20_TASK_IDS 0" >>confdefs.h + + HAVE_2_6_20_TASK_IDS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 2.6.24 task ids" >&5 +-echo $ECHO_N "checking kernel for 2.6.24 task ids... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_2_6_24_TASK_IDS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.24 task ids" >&5 ++$as_echo_n "checking kernel for 2.6.24 task ids... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_2_6_24_TASK_IDS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -30454,42 +21880,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_24_TASK_IDS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_24_TASK_IDS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -30497,22 +21899,18 @@ + cr_result=$cr_cv_kconfig_HAVE_2_6_24_TASK_IDS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_24_TASK_IDS 1 +-_ACEOF ++ $as_echo "#define HAVE_2_6_24_TASK_IDS 1" >>confdefs.h + + HAVE_2_6_24_TASK_IDS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_24_TASK_IDS 0 +-_ACEOF ++ $as_echo "#define HAVE_2_6_24_TASK_IDS 0" >>confdefs.h + + HAVE_2_6_24_TASK_IDS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # Should allow only exactly one match, except that 2.6.6 and 2.6.20/24 overlap during transitional period +@@ -30538,39 +21936,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -30584,36 +22002,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - can't find pgrp/session of a task_struct" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - can't find pgrp/session of a task_struct" >&2;} +- { (exit 1); exit 1; }; } +- +- ;; +-esac +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for set_task_pgrp" >&5 +-echo $ECHO_N "checking kernel for set_task_pgrp... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_SET_TASK_PGRP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - can't find pgrp/session of a task_struct" "$LINENO" 5 ++ ++ ;; ++esac ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for set_task_pgrp" >&5 ++$as_echo_n "checking kernel for set_task_pgrp... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_SET_TASK_PGRP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -30637,42 +22048,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_SET_TASK_PGRP=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_SET_TASK_PGRP=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -30680,48 +22067,39 @@ + cr_result=$cr_cv_kconfig_HAVE_SET_TASK_PGRP + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SET_TASK_PGRP 1 +-_ACEOF ++ $as_echo "#define HAVE_SET_TASK_PGRP 1" >>confdefs.h + + HAVE_SET_TASK_PGRP=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SET_TASK_PGRP 0 +-_ACEOF ++ $as_echo "#define HAVE_SET_TASK_PGRP 0" >>confdefs.h + + HAVE_SET_TASK_PGRP='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for set_task_session" >&5 +-echo $ECHO_N "checking kernel for set_task_session... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_SET_TASK_SESSION+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for set_task_session" >&5 ++$as_echo_n "checking kernel for set_task_session... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_SET_TASK_SESSION+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -30745,42 +22123,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_SET_TASK_SESSION=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_SET_TASK_SESSION=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -30788,49 +22142,40 @@ + cr_result=$cr_cv_kconfig_HAVE_SET_TASK_SESSION + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SET_TASK_SESSION 1 +-_ACEOF ++ $as_echo "#define HAVE_SET_TASK_SESSION 1" >>confdefs.h + + HAVE_SET_TASK_SESSION=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SET_TASK_SESSION 0 +-_ACEOF ++ $as_echo "#define HAVE_SET_TASK_SESSION 0" >>confdefs.h + + HAVE_SET_TASK_SESSION='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for valid_signal" >&5 +-echo $ECHO_N "checking kernel for valid_signal... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_VALID_SIGNAL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for valid_signal" >&5 ++$as_echo_n "checking kernel for valid_signal... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_VALID_SIGNAL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -30854,42 +22199,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_VALID_SIGNAL=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_VALID_SIGNAL=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -30897,49 +22218,40 @@ + cr_result=$cr_cv_kconfig_HAVE_VALID_SIGNAL + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_VALID_SIGNAL 1 +-_ACEOF ++ $as_echo "#define HAVE_VALID_SIGNAL 1" >>confdefs.h + + HAVE_VALID_SIGNAL=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_VALID_SIGNAL 0 +-_ACEOF ++ $as_echo "#define HAVE_VALID_SIGNAL 0" >>confdefs.h + + HAVE_VALID_SIGNAL='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for REMOVE_LINKS" >&5 +-echo $ECHO_N "checking kernel for REMOVE_LINKS... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_REMOVE_LINKS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for REMOVE_LINKS" >&5 ++$as_echo_n "checking kernel for REMOVE_LINKS... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_REMOVE_LINKS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -30960,42 +22272,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_REMOVE_LINKS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_REMOVE_LINKS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -31003,49 +22291,40 @@ + cr_result=$cr_cv_kconfig_HAVE_REMOVE_LINKS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_REMOVE_LINKS 1 +-_ACEOF ++ $as_echo "#define HAVE_REMOVE_LINKS 1" >>confdefs.h + + HAVE_REMOVE_LINKS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_REMOVE_LINKS 0 +-_ACEOF ++ $as_echo "#define HAVE_REMOVE_LINKS 0" >>confdefs.h + + HAVE_REMOVE_LINKS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for task.pids pid_link" >&5 +-echo $ECHO_N "checking kernel for task.pids pid_link... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.pids pid_link" >&5 ++$as_echo_n "checking kernel for task.pids pid_link... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -31063,42 +22342,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -31106,48 +22361,39 @@ + cr_result=$cr_cv_kconfig_HAVE_TASK_PIDS_PID_LINK + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_PIDS_PID_LINK 1 +-_ACEOF ++ $as_echo "#define HAVE_TASK_PIDS_PID_LINK 1" >>confdefs.h + + HAVE_TASK_PIDS_PID_LINK=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_PIDS_PID_LINK 0 +-_ACEOF ++ $as_echo "#define HAVE_TASK_PIDS_PID_LINK 0" >>confdefs.h + + HAVE_TASK_PIDS_PID_LINK='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for task.pids pid" >&5 +-echo $ECHO_N "checking kernel for task.pids pid... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_TASK_PIDS_PID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.pids pid" >&5 ++$as_echo_n "checking kernel for task.pids pid... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_TASK_PIDS_PID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -31165,42 +22411,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_PIDS_PID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_PIDS_PID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -31208,22 +22430,18 @@ + cr_result=$cr_cv_kconfig_HAVE_TASK_PIDS_PID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_PIDS_PID 1 +-_ACEOF ++ $as_echo "#define HAVE_TASK_PIDS_PID 1" >>confdefs.h + + HAVE_TASK_PIDS_PID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_PIDS_PID 0 +-_ACEOF ++ $as_echo "#define HAVE_TASK_PIDS_PID 0" >>confdefs.h + + HAVE_TASK_PIDS_PID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # Allow zero or one match +@@ -31247,39 +22465,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -31293,21 +22531,19 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine type of task.pids array" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine type of task.pids array" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine type of task.pids array" "$LINENO" 5 + + fi + + # put_task_struct() requires one of these: + + +- echo "$as_me:$LINENO: checking kernel symbol table for __put_task_struct" >&5 +-echo $ECHO_N "checking kernel symbol table for __put_task_struct... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab___put_task_struct+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for __put_task_struct" >&5 ++$as_echo_n "checking kernel symbol table for __put_task_struct... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab___put_task_struct+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab___put_task_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__put_task_struct$/ {s/ .*//p;q;}"` +@@ -31323,11 +22559,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -31347,42 +22579,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab___put_task_struct="Y$cr_cv_ksymtab___put_task_struct" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab___put_task_struct="N$cr_cv_ksymtab___put_task_struct" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -31393,9 +22601,10 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab___put_task_struct" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol __put_task_struct but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol __put_task_struct but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ cat >>$CR_KSYM_IMPORT_DECLS <<_EOF ++extern void __put_task_struct(struct task_struct *); ++_EOF ++ + fi + cr_result=`echo $cr_cv_ksymtab___put_task_struct | tr -d 'YN'` + if test $cr_result = 0; then +@@ -31411,17 +22620,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for __put_task_struct_cb" >&5 +-echo $ECHO_N "checking kernel symbol table for __put_task_struct_cb... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab___put_task_struct_cb+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for __put_task_struct_cb" >&5 ++$as_echo_n "checking kernel symbol table for __put_task_struct_cb... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab___put_task_struct_cb+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab___put_task_struct_cb=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__put_task_struct_cb$/ {s/ .*//p;q;}"` +@@ -31437,11 +22646,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -31461,42 +22666,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab___put_task_struct_cb="Y$cr_cv_ksymtab___put_task_struct_cb" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab___put_task_struct_cb="N$cr_cv_ksymtab___put_task_struct_cb" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -31507,9 +22688,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab___put_task_struct_cb" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol __put_task_struct_cb but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol __put_task_struct_cb but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol __put_task_struct_cb but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab___put_task_struct_cb | tr -d 'YN'` + if test $cr_result = 0; then +@@ -31525,34 +22704,29 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for mm.task_size" >&5 +-echo $ECHO_N "checking kernel for mm.task_size... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_MM_TASK_SIZE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.task_size" >&5 ++$as_echo_n "checking kernel for mm.task_size... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_MM_TASK_SIZE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -31570,42 +22744,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_MM_TASK_SIZE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_MM_TASK_SIZE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -31613,49 +22763,40 @@ + cr_result=$cr_cv_kconfig_HAVE_MM_TASK_SIZE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MM_TASK_SIZE 1 +-_ACEOF ++ $as_echo "#define HAVE_MM_TASK_SIZE 1" >>confdefs.h + + HAVE_MM_TASK_SIZE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MM_TASK_SIZE 0 +-_ACEOF ++ $as_echo "#define HAVE_MM_TASK_SIZE 0" >>confdefs.h + + HAVE_MM_TASK_SIZE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for PageAnon" >&5 +-echo $ECHO_N "checking kernel for PageAnon... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PAGEANON+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for PageAnon" >&5 ++$as_echo_n "checking kernel for PageAnon... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PAGEANON+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -31679,42 +22820,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PAGEANON=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PAGEANON=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -31722,22 +22839,18 @@ + cr_result=$cr_cv_kconfig_HAVE_PAGEANON + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PAGEANON 1 +-_ACEOF ++ $as_echo "#define HAVE_PAGEANON 1" >>confdefs.h + + HAVE_PAGEANON=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PAGEANON 0 +-_ACEOF ++ $as_echo "#define HAVE_PAGEANON 0" >>confdefs.h + + HAVE_PAGEANON='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + +@@ -31745,27 +22858,22 @@ + + + +- +- echo "$as_me:$LINENO: checking kernel for thread.vdso_base" >&5 +-echo $ECHO_N "checking kernel for thread.vdso_base... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_THREAD_VDSO_BASE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.vdso_base" >&5 ++$as_echo_n "checking kernel for thread.vdso_base... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_THREAD_VDSO_BASE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -31783,42 +22891,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_VDSO_BASE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_VDSO_BASE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -31826,48 +22910,39 @@ + cr_result=$cr_cv_kconfig_HAVE_THREAD_VDSO_BASE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_VDSO_BASE 1 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_VDSO_BASE 1" >>confdefs.h + + HAVE_THREAD_VDSO_BASE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_VDSO_BASE 0 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_VDSO_BASE 0" >>confdefs.h + + HAVE_THREAD_VDSO_BASE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for mm.context.vdso_base" >&5 +-echo $ECHO_N "checking kernel for mm.context.vdso_base... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.context.vdso_base" >&5 ++$as_echo_n "checking kernel for mm.context.vdso_base... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -31885,42 +22960,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -31928,48 +22979,39 @@ + cr_result=$cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO_BASE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MM_CONTEXT_VDSO_BASE 1 +-_ACEOF ++ $as_echo "#define HAVE_MM_CONTEXT_VDSO_BASE 1" >>confdefs.h + + HAVE_MM_CONTEXT_VDSO_BASE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MM_CONTEXT_VDSO_BASE 0 +-_ACEOF ++ $as_echo "#define HAVE_MM_CONTEXT_VDSO_BASE 0" >>confdefs.h + + HAVE_MM_CONTEXT_VDSO_BASE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for mm.context.vdso" >&5 +-echo $ECHO_N "checking kernel for mm.context.vdso... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.context.vdso" >&5 ++$as_echo_n "checking kernel for mm.context.vdso... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -31987,42 +23029,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -32030,48 +23048,39 @@ + cr_result=$cr_cv_kconfig_HAVE_MM_CONTEXT_VDSO + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MM_CONTEXT_VDSO 1 +-_ACEOF ++ $as_echo "#define HAVE_MM_CONTEXT_VDSO 1" >>confdefs.h + + HAVE_MM_CONTEXT_VDSO=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MM_CONTEXT_VDSO 0 +-_ACEOF ++ $as_echo "#define HAVE_MM_CONTEXT_VDSO 0" >>confdefs.h + + HAVE_MM_CONTEXT_VDSO='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for thread_info.sysenter_return" >&5 +-echo $ECHO_N "checking kernel for thread_info.sysenter_return... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread_info.sysenter_return" >&5 ++$as_echo_n "checking kernel for thread_info.sysenter_return... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -32089,42 +23098,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -32132,49 +23117,40 @@ + cr_result=$cr_cv_kconfig_HAVE_THREAD_INFO_SYSENTER_RETURN + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_INFO_SYSENTER_RETURN 1 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_INFO_SYSENTER_RETURN 1" >>confdefs.h + + HAVE_THREAD_INFO_SYSENTER_RETURN=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_INFO_SYSENTER_RETURN 0 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_INFO_SYSENTER_RETURN 0" >>confdefs.h + + HAVE_THREAD_INFO_SYSENTER_RETURN='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test $CR_ARCH = arm; then + + + +- +- echo "$as_me:$LINENO: checking kernel for thread_info.tp_value" >&5 +-echo $ECHO_N "checking kernel for thread_info.tp_value... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread_info.tp_value" >&5 ++$as_echo_n "checking kernel for thread_info.tp_value... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -32192,42 +23168,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -32235,32 +23187,28 @@ + cr_result=$cr_cv_kconfig_HAVE_THREAD_INFO_TP_VALUE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_INFO_TP_VALUE 1 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_INFO_TP_VALUE 1" >>confdefs.h + + HAVE_THREAD_INFO_TP_VALUE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_INFO_TP_VALUE 0 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_INFO_TP_VALUE 0" >>confdefs.h + + HAVE_THREAD_INFO_TP_VALUE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for __kuser_helper_start" >&5 +-echo $ECHO_N "checking kernel symbol table for __kuser_helper_start... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab___kuser_helper_start+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for __kuser_helper_start" >&5 ++$as_echo_n "checking kernel symbol table for __kuser_helper_start... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab___kuser_helper_start+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab___kuser_helper_start=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__kuser_helper_start$/ {s/ .*//p;q;}"` +@@ -32276,11 +23224,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -32300,42 +23244,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab___kuser_helper_start="Y$cr_cv_ksymtab___kuser_helper_start" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab___kuser_helper_start="N$cr_cv_ksymtab___kuser_helper_start" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -32365,17 +23285,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for __kuser_cmpxchg" >&5 +-echo $ECHO_N "checking kernel symbol table for __kuser_cmpxchg... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab___kuser_cmpxchg+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for __kuser_cmpxchg" >&5 ++$as_echo_n "checking kernel symbol table for __kuser_cmpxchg... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab___kuser_cmpxchg+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab___kuser_cmpxchg=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__kuser_cmpxchg$/ {s/ .*//p;q;}"` +@@ -32391,11 +23311,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -32415,42 +23331,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab___kuser_cmpxchg="Y$cr_cv_ksymtab___kuser_cmpxchg" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab___kuser_cmpxchg="N$cr_cv_ksymtab___kuser_cmpxchg" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -32480,34 +23372,29 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +-fi +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for VSYSCALL_BASE" >&5 +-echo $ECHO_N "checking kernel for VSYSCALL_BASE... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_VSYSCALL_BASE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++fi ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for VSYSCALL_BASE" >&5 ++$as_echo_n "checking kernel for VSYSCALL_BASE... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_VSYSCALL_BASE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -32527,42 +23414,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_VSYSCALL_BASE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_VSYSCALL_BASE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -32570,51 +23433,42 @@ + cr_result=$cr_cv_kconfig_HAVE_VSYSCALL_BASE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_VSYSCALL_BASE 1 +-_ACEOF ++ $as_echo "#define HAVE_VSYSCALL_BASE 1" >>confdefs.h + + HAVE_VSYSCALL_BASE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_VSYSCALL_BASE 0 +-_ACEOF ++ $as_echo "#define HAVE_VSYSCALL_BASE 0" >>confdefs.h + + HAVE_VSYSCALL_BASE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 2-arg arch_setup_additional_pages" >&5 +-echo $ECHO_N "checking kernel for 2-arg arch_setup_additional_pages... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg arch_setup_additional_pages" >&5 ++$as_echo_n "checking kernel for 2-arg arch_setup_additional_pages... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -32638,42 +23492,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -32681,52 +23511,43 @@ + cr_result=$cr_cv_kconfig_HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1 +-_ACEOF ++ $as_echo "#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1" >>confdefs.h + + HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0 +-_ACEOF ++ $as_echo "#define HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0" >>confdefs.h + + HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 4-arg arch_setup_additional_pages" >&5 +-echo $ECHO_N "checking kernel for 4-arg arch_setup_additional_pages... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 4-arg arch_setup_additional_pages" >&5 ++$as_echo_n "checking kernel for 4-arg arch_setup_additional_pages... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -32750,42 +23571,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -32793,22 +23590,18 @@ + cr_result=$cr_cv_kconfig_HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1 +-_ACEOF ++ $as_echo "#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 1" >>confdefs.h + + HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0 +-_ACEOF ++ $as_echo "#define HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES 0" >>confdefs.h + + HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + +@@ -32816,12 +23609,12 @@ + if test -n "${HAVE_2_ARG_ARCH_SETUP_ADDITIONAL_PAGES}${HAVE_4_ARG_ARCH_SETUP_ADDITIONAL_PAGES}"; then + + +- echo "$as_me:$LINENO: checking kernel symbol table for arch_setup_additional_pages" >&5 +-echo $ECHO_N "checking kernel symbol table for arch_setup_additional_pages... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_arch_setup_additional_pages+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for arch_setup_additional_pages" >&5 ++$as_echo_n "checking kernel symbol table for arch_setup_additional_pages... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_arch_setup_additional_pages+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_arch_setup_additional_pages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_setup_additional_pages$/ {s/ .*//p;q;}"` +@@ -32837,11 +23630,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -32861,42 +23650,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_arch_setup_additional_pages="Y$cr_cv_ksymtab_arch_setup_additional_pages" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_arch_setup_additional_pages="N$cr_cv_ksymtab_arch_setup_additional_pages" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -32907,9 +23672,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_arch_setup_additional_pages" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol arch_setup_additional_pages but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol arch_setup_additional_pages but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol arch_setup_additional_pages but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_arch_setup_additional_pages | tr -d 'YN'` + if test $cr_result = 0; then +@@ -32925,34 +23688,29 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +-fi +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for map_vsyscall" >&5 +-echo $ECHO_N "checking kernel for map_vsyscall... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_MAP_VSYSCALL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++fi ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for map_vsyscall" >&5 ++$as_echo_n "checking kernel for map_vsyscall... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_MAP_VSYSCALL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -32981,42 +23739,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_MAP_VSYSCALL=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_MAP_VSYSCALL=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -33024,33 +23758,29 @@ + cr_result=$cr_cv_kconfig_HAVE_MAP_VSYSCALL + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MAP_VSYSCALL 1 +-_ACEOF ++ $as_echo "#define HAVE_MAP_VSYSCALL 1" >>confdefs.h + + HAVE_MAP_VSYSCALL=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MAP_VSYSCALL 0 +-_ACEOF ++ $as_echo "#define HAVE_MAP_VSYSCALL 0" >>confdefs.h + + HAVE_MAP_VSYSCALL='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -n "${HAVE_MAP_VSYSCALL}"; then + + +- echo "$as_me:$LINENO: checking kernel symbol table for map_vsyscall" >&5 +-echo $ECHO_N "checking kernel symbol table for map_vsyscall... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_map_vsyscall+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for map_vsyscall" >&5 ++$as_echo_n "checking kernel symbol table for map_vsyscall... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_map_vsyscall+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_map_vsyscall=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}map_vsyscall$/ {s/ .*//p;q;}"` +@@ -33066,11 +23796,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -33090,42 +23816,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_map_vsyscall="Y$cr_cv_ksymtab_map_vsyscall" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_map_vsyscall="N$cr_cv_ksymtab_map_vsyscall" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -33136,9 +23838,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_map_vsyscall" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol map_vsyscall but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol map_vsyscall but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol map_vsyscall but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_map_vsyscall | tr -d 'YN'` + if test $cr_result = 0; then +@@ -33154,19 +23854,19 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +-fi +-if test $CR_ARCH = x86_64; then +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for syscall32_setup_pages" >&5 +-echo $ECHO_N "checking kernel symbol table for syscall32_setup_pages... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_syscall32_setup_pages+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++fi ++if test $CR_KARCH = x86_64; then ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for syscall32_setup_pages" >&5 ++$as_echo_n "checking kernel symbol table for syscall32_setup_pages... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_syscall32_setup_pages+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_syscall32_setup_pages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}syscall32_setup_pages$/ {s/ .*//p;q;}"` +@@ -33182,11 +23882,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -33206,42 +23902,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_syscall32_setup_pages="Y$cr_cv_ksymtab_syscall32_setup_pages" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_syscall32_setup_pages="N$cr_cv_ksymtab_syscall32_setup_pages" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -33271,19 +23943,19 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +-fi +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for arch_pick_mmap_layout" >&5 +-echo $ECHO_N "checking kernel symbol table for arch_pick_mmap_layout... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_arch_pick_mmap_layout+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++fi ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for arch_pick_mmap_layout" >&5 ++$as_echo_n "checking kernel symbol table for arch_pick_mmap_layout... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_arch_pick_mmap_layout+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_arch_pick_mmap_layout=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_pick_mmap_layout$/ {s/ .*//p;q;}"` +@@ -33299,11 +23971,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -33323,42 +23991,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_arch_pick_mmap_layout="Y$cr_cv_ksymtab_arch_pick_mmap_layout" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_arch_pick_mmap_layout="N$cr_cv_ksymtab_arch_pick_mmap_layout" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -33369,9 +24013,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_arch_pick_mmap_layout" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol arch_pick_mmap_layout but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol arch_pick_mmap_layout but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol arch_pick_mmap_layout but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_arch_pick_mmap_layout | tr -d 'YN'` + if test $cr_result = 0; then +@@ -33387,17 +24029,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for arch_get_unmaped_area" >&5 +-echo $ECHO_N "checking kernel symbol table for arch_get_unmaped_area... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_arch_get_unmaped_area+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for arch_get_unmaped_area" >&5 ++$as_echo_n "checking kernel symbol table for arch_get_unmaped_area... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_arch_get_unmaped_area+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_arch_get_unmaped_area=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_get_unmaped_area$/ {s/ .*//p;q;}"` +@@ -33413,11 +24055,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -33437,42 +24075,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_arch_get_unmaped_area="Y$cr_cv_ksymtab_arch_get_unmaped_area" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_arch_get_unmaped_area="N$cr_cv_ksymtab_arch_get_unmaped_area" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -33483,9 +24097,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_arch_get_unmaped_area" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol arch_get_unmaped_area but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol arch_get_unmaped_area but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol arch_get_unmaped_area but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_arch_get_unmaped_area | tr -d 'YN'` + if test $cr_result = 0; then +@@ -33501,17 +24113,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for arch_unmap_area" >&5 +-echo $ECHO_N "checking kernel symbol table for arch_unmap_area... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_arch_unmap_area+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for arch_unmap_area" >&5 ++$as_echo_n "checking kernel symbol table for arch_unmap_area... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_arch_unmap_area+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_arch_unmap_area=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}arch_unmap_area$/ {s/ .*//p;q;}"` +@@ -33527,11 +24139,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -33551,42 +24159,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_arch_unmap_area="Y$cr_cv_ksymtab_arch_unmap_area" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_arch_unmap_area="N$cr_cv_ksymtab_arch_unmap_area" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -33597,9 +24181,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_arch_unmap_area" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol arch_unmap_area but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol arch_unmap_area but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol arch_unmap_area but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_arch_unmap_area | tr -d 'YN'` + if test $cr_result = 0; then +@@ -33615,33 +24197,28 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for mm.mmap_base" >&5 +-echo $ECHO_N "checking kernel for mm.mmap_base... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_MM_MMAP_BASE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.mmap_base" >&5 ++$as_echo_n "checking kernel for mm.mmap_base... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_MM_MMAP_BASE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -33659,42 +24236,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_MM_MMAP_BASE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_MM_MMAP_BASE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -33702,48 +24255,39 @@ + cr_result=$cr_cv_kconfig_HAVE_MM_MMAP_BASE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MM_MMAP_BASE 1 +-_ACEOF ++ $as_echo "#define HAVE_MM_MMAP_BASE 1" >>confdefs.h + + HAVE_MM_MMAP_BASE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MM_MMAP_BASE 0 +-_ACEOF ++ $as_echo "#define HAVE_MM_MMAP_BASE 0" >>confdefs.h + + HAVE_MM_MMAP_BASE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for mm.cached_hole_size" >&5 +-echo $ECHO_N "checking kernel for mm.cached_hole_size... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.cached_hole_size" >&5 ++$as_echo_n "checking kernel for mm.cached_hole_size... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -33761,42 +24305,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -33804,49 +24324,40 @@ + cr_result=$cr_cv_kconfig_HAVE_MM_CACHED_HOLE_SIZE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MM_CACHED_HOLE_SIZE 1 +-_ACEOF ++ $as_echo "#define HAVE_MM_CACHED_HOLE_SIZE 1" >>confdefs.h + + HAVE_MM_CACHED_HOLE_SIZE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MM_CACHED_HOLE_SIZE 0 +-_ACEOF ++ $as_echo "#define HAVE_MM_CACHED_HOLE_SIZE 0" >>confdefs.h + + HAVE_MM_CACHED_HOLE_SIZE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for CONFIG_HUGETLBFS" >&5 +-echo $ECHO_N "checking kernel for CONFIG_HUGETLBFS... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for CONFIG_HUGETLBFS" >&5 ++$as_echo_n "checking kernel for CONFIG_HUGETLBFS... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -33867,42 +24378,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -33910,33 +24397,29 @@ + cr_result=$cr_cv_kconfig_HAVE_CONFIG_HUGETLBFS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_CONFIG_HUGETLBFS 1 +-_ACEOF ++ $as_echo "#define HAVE_CONFIG_HUGETLBFS 1" >>confdefs.h + + HAVE_CONFIG_HUGETLBFS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_CONFIG_HUGETLBFS 0 +-_ACEOF ++ $as_echo "#define HAVE_CONFIG_HUGETLBFS 0" >>confdefs.h + + HAVE_CONFIG_HUGETLBFS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -n "${HAVE_CONFIG_HUGETLBFS}"; then + + +- echo "$as_me:$LINENO: checking kernel symbol table for hugetlbfs_file_operations" >&5 +-echo $ECHO_N "checking kernel symbol table for hugetlbfs_file_operations... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_hugetlbfs_file_operations+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for hugetlbfs_file_operations" >&5 ++$as_echo_n "checking kernel symbol table for hugetlbfs_file_operations... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_hugetlbfs_file_operations+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_hugetlbfs_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}hugetlbfs_file_operations$/ {s/ .*//p;q;}"` +@@ -33952,11 +24435,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -33976,42 +24455,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_hugetlbfs_file_operations="Y$cr_cv_ksymtab_hugetlbfs_file_operations" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_hugetlbfs_file_operations="N$cr_cv_ksymtab_hugetlbfs_file_operations" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -34041,17 +24496,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for is_file_shm_hugepages" >&5 +-echo $ECHO_N "checking kernel symbol table for is_file_shm_hugepages... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_is_file_shm_hugepages+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for is_file_shm_hugepages" >&5 ++$as_echo_n "checking kernel symbol table for is_file_shm_hugepages... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_is_file_shm_hugepages+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_is_file_shm_hugepages=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}is_file_shm_hugepages$/ {s/ .*//p;q;}"` +@@ -34067,11 +24522,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -34091,42 +24542,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_is_file_shm_hugepages="Y$cr_cv_ksymtab_is_file_shm_hugepages" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_is_file_shm_hugepages="N$cr_cv_ksymtab_is_file_shm_hugepages" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -34156,17 +24583,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for hugepage_vma" >&5 +-echo $ECHO_N "checking kernel symbol table for hugepage_vma... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_hugepage_vma+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for hugepage_vma" >&5 ++$as_echo_n "checking kernel symbol table for hugepage_vma... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_hugepage_vma+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_hugepage_vma=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}hugepage_vma$/ {s/ .*//p;q;}"` +@@ -34182,11 +24609,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -34206,42 +24629,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_hugepage_vma="Y$cr_cv_ksymtab_hugepage_vma" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_hugepage_vma="N$cr_cv_ksymtab_hugepage_vma" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -34271,17 +24670,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for pmd_huge" >&5 +-echo $ECHO_N "checking kernel symbol table for pmd_huge... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_pmd_huge+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pmd_huge" >&5 ++$as_echo_n "checking kernel symbol table for pmd_huge... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_pmd_huge+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_pmd_huge=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}pmd_huge$/ {s/ .*//p;q;}"` +@@ -34297,11 +24696,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -34321,42 +24716,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_pmd_huge="Y$cr_cv_ksymtab_pmd_huge" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_pmd_huge="N$cr_cv_ksymtab_pmd_huge" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -34386,17 +24757,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for follow_huge_pmd" >&5 +-echo $ECHO_N "checking kernel symbol table for follow_huge_pmd... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_follow_huge_pmd+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for follow_huge_pmd" >&5 ++$as_echo_n "checking kernel symbol table for follow_huge_pmd... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_follow_huge_pmd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_follow_huge_pmd=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}follow_huge_pmd$/ {s/ .*//p;q;}"` +@@ -34412,11 +24783,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -34436,42 +24803,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_follow_huge_pmd="Y$cr_cv_ksymtab_follow_huge_pmd" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_follow_huge_pmd="N$cr_cv_ksymtab_follow_huge_pmd" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -34501,17 +24844,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for follow_huge_addr" >&5 +-echo $ECHO_N "checking kernel symbol table for follow_huge_addr... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_follow_huge_addr+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for follow_huge_addr" >&5 ++$as_echo_n "checking kernel symbol table for follow_huge_addr... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_follow_huge_addr+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_follow_huge_addr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}follow_huge_addr$/ {s/ .*//p;q;}"` +@@ -34527,11 +24870,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -34551,42 +24890,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_follow_huge_addr="Y$cr_cv_ksymtab_follow_huge_addr" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_follow_huge_addr="N$cr_cv_ksymtab_follow_huge_addr" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -34597,9 +24912,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_follow_huge_addr" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol follow_huge_addr but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol follow_huge_addr but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol follow_huge_addr but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_follow_huge_addr | tr -d 'YN'` + if test $cr_result = 0; then +@@ -34615,8 +24928,8 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + # Must have prototype, or NARGS probe will fail + + +@@ -34624,27 +24937,22 @@ + + + +- +- echo "$as_me:$LINENO: checking kernel for 3-arg follow_huge_addr" >&5 +-echo $ECHO_N "checking kernel for 3-arg follow_huge_addr... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 3-arg follow_huge_addr" >&5 ++$as_echo_n "checking kernel for 3-arg follow_huge_addr... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -34666,42 +24974,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -34709,52 +24993,43 @@ + cr_result=$cr_cv_kconfig_HAVE_3_ARG_FOLLOW_HUGE_ADDR + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 1 +-_ACEOF ++ $as_echo "#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 1" >>confdefs.h + + HAVE_3_ARG_FOLLOW_HUGE_ADDR=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 0 +-_ACEOF ++ $as_echo "#define HAVE_3_ARG_FOLLOW_HUGE_ADDR 0" >>confdefs.h + + HAVE_3_ARG_FOLLOW_HUGE_ADDR='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 4-arg follow_huge_addr" >&5 +-echo $ECHO_N "checking kernel for 4-arg follow_huge_addr... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 4-arg follow_huge_addr" >&5 ++$as_echo_n "checking kernel for 4-arg follow_huge_addr... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -34776,42 +25051,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -34819,22 +25070,18 @@ + cr_result=$cr_cv_kconfig_HAVE_4_ARG_FOLLOW_HUGE_ADDR + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 1 +-_ACEOF ++ $as_echo "#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 1" >>confdefs.h + + HAVE_4_ARG_FOLLOW_HUGE_ADDR=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 0 +-_ACEOF ++ $as_echo "#define HAVE_4_ARG_FOLLOW_HUGE_ADDR 0" >>confdefs.h + + HAVE_4_ARG_FOLLOW_HUGE_ADDR='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + +@@ -34859,39 +25106,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -34905,9 +25172,7 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - CONFIG_HUGETLBFS set, but unable to determine how invoke follow_huge_addr()" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - CONFIG_HUGETLBFS set, but unable to determine how invoke follow_huge_addr()" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Unable to use kernel $LINUX_VER - CONFIG_HUGETLBFS set, but unable to determine how invoke follow_huge_addr()" "$LINENO" 5 + + fi + fi +@@ -34920,12 +25185,12 @@ + sparc*) + + +- echo "$as_me:$LINENO: checking kernel symbol table for mem_map_zero" >&5 +-echo $ECHO_N "checking kernel symbol table for mem_map_zero... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_mem_map_zero+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for mem_map_zero" >&5 ++$as_echo_n "checking kernel symbol table for mem_map_zero... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_mem_map_zero+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_mem_map_zero=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}mem_map_zero$/ {s/ .*//p;q;}"` +@@ -34941,11 +25206,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -34965,42 +25226,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_mem_map_zero="Y$cr_cv_ksymtab_mem_map_zero" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_mem_map_zero="N$cr_cv_ksymtab_mem_map_zero" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -35011,9 +25248,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_mem_map_zero" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol mem_map_zero but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol mem_map_zero but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol mem_map_zero but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_mem_map_zero | tr -d 'YN'` + if test $cr_result = 0; then +@@ -35029,20 +25264,20 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + ZERO_PAGE_SYMBOL=mem_map_zero + ;; + *) + + +- echo "$as_me:$LINENO: checking kernel symbol table for empty_zero_page" >&5 +-echo $ECHO_N "checking kernel symbol table for empty_zero_page... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_empty_zero_page+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for empty_zero_page" >&5 ++$as_echo_n "checking kernel symbol table for empty_zero_page... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_empty_zero_page+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_empty_zero_page=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}empty_zero_page$/ {s/ .*//p;q;}"` +@@ -35058,11 +25293,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -35082,42 +25313,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_empty_zero_page="Y$cr_cv_ksymtab_empty_zero_page" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_empty_zero_page="N$cr_cv_ksymtab_empty_zero_page" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -35128,9 +25335,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_empty_zero_page" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol empty_zero_page but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol empty_zero_page but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol empty_zero_page but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_empty_zero_page | tr -d 'YN'` + if test $cr_result = 0; then +@@ -35146,43 +25351,36 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + ZERO_PAGE_SYMBOL=empty_zero_page + ;; + esac + if test -z "$cr_addr"; then +- { { echo "$as_me:$LINENO: error: failed to find symbol $ZERO_PAGE_SYMBOL" >&5 +-echo "$as_me: error: failed to find symbol $ZERO_PAGE_SYMBOL" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "failed to find symbol $ZERO_PAGE_SYMBOL" "$LINENO" 5 + fi + + # How to check for permission + + + +- +- echo "$as_me:$LINENO: checking kernel for inode_permission" >&5 +-echo $ECHO_N "checking kernel for inode_permission... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_INODE_PERMISSION+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for inode_permission" >&5 ++$as_echo_n "checking kernel for inode_permission... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_INODE_PERMISSION+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -35206,42 +25404,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_INODE_PERMISSION=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_INODE_PERMISSION=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -35249,48 +25423,39 @@ + cr_result=$cr_cv_kconfig_HAVE_INODE_PERMISSION + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_INODE_PERMISSION 1 +-_ACEOF ++ $as_echo "#define HAVE_INODE_PERMISSION 1" >>confdefs.h + + HAVE_INODE_PERMISSION=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_INODE_PERMISSION 0 +-_ACEOF ++ $as_echo "#define HAVE_INODE_PERMISSION 0" >>confdefs.h + + HAVE_INODE_PERMISSION='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for permission" >&5 +-echo $ECHO_N "checking kernel for permission... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PERMISSION+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for permission" >&5 ++$as_echo_n "checking kernel for permission... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PERMISSION+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -35314,42 +25479,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PERMISSION=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PERMISSION=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -35357,22 +25498,18 @@ + cr_result=$cr_cv_kconfig_HAVE_PERMISSION + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PERMISSION 1 +-_ACEOF ++ $as_echo "#define HAVE_PERMISSION 1" >>confdefs.h + + HAVE_PERMISSION=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PERMISSION 0 +-_ACEOF ++ $as_echo "#define HAVE_PERMISSION 0" >>confdefs.h + + HAVE_PERMISSION='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -z "${HAVE_INODE_PERMISSION}${HAVE_PERMISSION}"; then +@@ -35395,39 +25532,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -35441,21 +25598,19 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to invoke permission() or inode_permission" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to invoke permission() or inode_permission" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine how to invoke permission() or inode_permission" "$LINENO" 5 + + fi + + # Bits for save/restore of pending signals + + +- echo "$as_me:$LINENO: checking kernel symbol table for copy_siginfo_to_user" >&5 +-echo $ECHO_N "checking kernel symbol table for copy_siginfo_to_user... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_copy_siginfo_to_user+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for copy_siginfo_to_user" >&5 ++$as_echo_n "checking kernel symbol table for copy_siginfo_to_user... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_copy_siginfo_to_user+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_copy_siginfo_to_user=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}copy_siginfo_to_user$/ {s/ .*//p;q;}"` +@@ -35471,11 +25626,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -35495,42 +25646,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_copy_siginfo_to_user="Y$cr_cv_ksymtab_copy_siginfo_to_user" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_copy_siginfo_to_user="N$cr_cv_ksymtab_copy_siginfo_to_user" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -35560,17 +25687,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for group_send_sig_info" >&5 +-echo $ECHO_N "checking kernel symbol table for group_send_sig_info... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_group_send_sig_info+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for group_send_sig_info" >&5 ++$as_echo_n "checking kernel symbol table for group_send_sig_info... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_group_send_sig_info+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_group_send_sig_info=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}group_send_sig_info$/ {s/ .*//p;q;}"` +@@ -35586,11 +25713,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -35610,42 +25733,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_group_send_sig_info="Y$cr_cv_ksymtab_group_send_sig_info" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_group_send_sig_info="N$cr_cv_ksymtab_group_send_sig_info" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -35675,19 +25774,19 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # For save/restore of sigaltstack + + +- echo "$as_me:$LINENO: checking kernel symbol table for do_sigaltstack" >&5 +-echo $ECHO_N "checking kernel symbol table for do_sigaltstack... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_do_sigaltstack+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for do_sigaltstack" >&5 ++$as_echo_n "checking kernel symbol table for do_sigaltstack... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_do_sigaltstack+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_do_sigaltstack=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_sigaltstack$/ {s/ .*//p;q;}"` +@@ -35703,11 +25802,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -35727,42 +25822,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_do_sigaltstack="Y$cr_cv_ksymtab_do_sigaltstack" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_do_sigaltstack="N$cr_cv_ksymtab_do_sigaltstack" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -35792,35 +25863,30 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +-if test $CR_ARCH = i386 -o $CR_ARCH = x86_64; then +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for struct n_desc_struct" >&5 +-echo $ECHO_N "checking kernel for struct n_desc_struct... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++if test $CR_KARCH = i386 -o $CR_KARCH = x86_64; then ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct n_desc_struct" >&5 ++$as_echo_n "checking kernel for struct n_desc_struct... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -35842,42 +25908,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -35885,48 +25927,39 @@ + cr_result=$cr_cv_kconfig_HAVE_STRUCT_N_DESC_STRUCT + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRUCT_N_DESC_STRUCT 1 +-_ACEOF ++ $as_echo "#define HAVE_STRUCT_N_DESC_STRUCT 1" >>confdefs.h + + HAVE_STRUCT_N_DESC_STRUCT=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRUCT_N_DESC_STRUCT 0 +-_ACEOF ++ $as_echo "#define HAVE_STRUCT_N_DESC_STRUCT 0" >>confdefs.h + + HAVE_STRUCT_N_DESC_STRUCT='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for cpu_gdt_descr" >&5 +-echo $ECHO_N "checking kernel for cpu_gdt_descr... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_CPU_GDT_DESCR+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for cpu_gdt_descr" >&5 ++$as_echo_n "checking kernel for cpu_gdt_descr... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_CPU_GDT_DESCR+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -35946,42 +25979,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_CPU_GDT_DESCR=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_CPU_GDT_DESCR=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -35989,33 +25998,29 @@ + cr_result=$cr_cv_kconfig_HAVE_CPU_GDT_DESCR + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_CPU_GDT_DESCR 1 +-_ACEOF ++ $as_echo "#define HAVE_CPU_GDT_DESCR 1" >>confdefs.h + + HAVE_CPU_GDT_DESCR=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_CPU_GDT_DESCR 0 +-_ACEOF ++ $as_echo "#define HAVE_CPU_GDT_DESCR 0" >>confdefs.h + + HAVE_CPU_GDT_DESCR='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -n "${HAVE_CPU_GDT_DESCR}"; then + + +- echo "$as_me:$LINENO: checking kernel symbol table for cpu_gdt_descr" >&5 +-echo $ECHO_N "checking kernel symbol table for cpu_gdt_descr... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_cpu_gdt_descr+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for cpu_gdt_descr" >&5 ++$as_echo_n "checking kernel symbol table for cpu_gdt_descr... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_cpu_gdt_descr+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_cpu_gdt_descr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}cpu_gdt_descr$/ {s/ .*//p;q;}"` +@@ -36031,11 +26036,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -36055,42 +26056,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_cpu_gdt_descr="Y$cr_cv_ksymtab_cpu_gdt_descr" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_cpu_gdt_descr="N$cr_cv_ksymtab_cpu_gdt_descr" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -36101,9 +26078,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_cpu_gdt_descr" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol cpu_gdt_descr but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol cpu_gdt_descr but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol cpu_gdt_descr but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_cpu_gdt_descr | tr -d 'YN'` + if test $cr_result = 0; then +@@ -36119,18 +26094,18 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- fi +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for cpu_gdt_table" >&5 +-echo $ECHO_N "checking kernel symbol table for cpu_gdt_table... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_cpu_gdt_table+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ fi ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for cpu_gdt_table" >&5 ++$as_echo_n "checking kernel symbol table for cpu_gdt_table... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_cpu_gdt_table+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_cpu_gdt_table=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}cpu_gdt_table$/ {s/ .*//p;q;}"` +@@ -36146,11 +26121,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -36170,42 +26141,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_cpu_gdt_table="Y$cr_cv_ksymtab_cpu_gdt_table" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_cpu_gdt_table="N$cr_cv_ksymtab_cpu_gdt_table" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -36216,9 +26163,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_cpu_gdt_table" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol cpu_gdt_table but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol cpu_gdt_table but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol cpu_gdt_table but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_cpu_gdt_table | tr -d 'YN'` + if test $cr_result = 0; then +@@ -36234,17 +26179,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for per_cpu__cpu_gdt_descr" >&5 +-echo $ECHO_N "checking kernel symbol table for per_cpu__cpu_gdt_descr... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_per_cpu__cpu_gdt_descr+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for per_cpu__cpu_gdt_descr" >&5 ++$as_echo_n "checking kernel symbol table for per_cpu__cpu_gdt_descr... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_per_cpu__cpu_gdt_descr+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_per_cpu__cpu_gdt_descr=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}per_cpu__cpu_gdt_descr$/ {s/ .*//p;q;}"` +@@ -36260,11 +26205,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -36284,42 +26225,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_per_cpu__cpu_gdt_descr="Y$cr_cv_ksymtab_per_cpu__cpu_gdt_descr" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_per_cpu__cpu_gdt_descr="N$cr_cv_ksymtab_per_cpu__cpu_gdt_descr" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -36330,9 +26247,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_per_cpu__cpu_gdt_descr" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol per_cpu__cpu_gdt_descr but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol per_cpu__cpu_gdt_descr but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol per_cpu__cpu_gdt_descr but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_per_cpu__cpu_gdt_descr | tr -d 'YN'` + if test $cr_result = 0; then +@@ -36348,34 +26263,29 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for thread.sp0" >&5 +-echo $ECHO_N "checking kernel for thread.sp0... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_THREAD_SP0+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.sp0" >&5 ++$as_echo_n "checking kernel for thread.sp0... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_THREAD_SP0+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -36393,42 +26303,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_SP0=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_SP0=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -36436,48 +26322,39 @@ + cr_result=$cr_cv_kconfig_HAVE_THREAD_SP0 + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_SP0 1 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_SP0 1" >>confdefs.h + + HAVE_THREAD_SP0=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_SP0 0 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_SP0 0" >>confdefs.h + + HAVE_THREAD_SP0='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for thread.esp0" >&5 +-echo $ECHO_N "checking kernel for thread.esp0... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_THREAD_ESP0+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.esp0" >&5 ++$as_echo_n "checking kernel for thread.esp0... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_THREAD_ESP0+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -36495,42 +26372,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_ESP0=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_ESP0=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -36538,48 +26391,39 @@ + cr_result=$cr_cv_kconfig_HAVE_THREAD_ESP0 + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_ESP0 1 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_ESP0 1" >>confdefs.h + + HAVE_THREAD_ESP0=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_ESP0 0 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_ESP0 0" >>confdefs.h + + HAVE_THREAD_ESP0='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for thread.rsp0" >&5 +-echo $ECHO_N "checking kernel for thread.rsp0... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_THREAD_RSP0+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.rsp0" >&5 ++$as_echo_n "checking kernel for thread.rsp0... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_THREAD_RSP0+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -36597,42 +26441,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_RSP0=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_RSP0=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -36640,48 +26460,39 @@ + cr_result=$cr_cv_kconfig_HAVE_THREAD_RSP0 + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_RSP0 1 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_RSP0 1" >>confdefs.h + + HAVE_THREAD_RSP0=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_RSP0 0 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_RSP0 0" >>confdefs.h + + HAVE_THREAD_RSP0='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for thread.usersp" >&5 +-echo $ECHO_N "checking kernel for thread.usersp... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_THREAD_USERSP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.usersp" >&5 ++$as_echo_n "checking kernel for thread.usersp... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_THREAD_USERSP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -36699,42 +26510,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_USERSP=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_USERSP=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -36742,48 +26529,39 @@ + cr_result=$cr_cv_kconfig_HAVE_THREAD_USERSP + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_USERSP 1 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_USERSP 1" >>confdefs.h + + HAVE_THREAD_USERSP=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_USERSP 0 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_USERSP 0" >>confdefs.h + + HAVE_THREAD_USERSP='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for thread.userrsp" >&5 +-echo $ECHO_N "checking kernel for thread.userrsp... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_THREAD_USERRSP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.userrsp" >&5 ++$as_echo_n "checking kernel for thread.userrsp... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_THREAD_USERRSP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -36801,42 +26579,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_USERRSP=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_USERRSP=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -36844,48 +26598,39 @@ + cr_result=$cr_cv_kconfig_HAVE_THREAD_USERRSP + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_USERRSP 1 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_USERRSP 1" >>confdefs.h + + HAVE_THREAD_USERRSP=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_USERRSP 0 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_USERRSP 0" >>confdefs.h + + HAVE_THREAD_USERRSP='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for thread.debugreg0" >&5 +-echo $ECHO_N "checking kernel for thread.debugreg0... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_THREAD_DEBUGREG0+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.debugreg0" >&5 ++$as_echo_n "checking kernel for thread.debugreg0... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_THREAD_DEBUGREG0+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -36903,42 +26648,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_DEBUGREG0=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_DEBUGREG0=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -36946,48 +26667,39 @@ + cr_result=$cr_cv_kconfig_HAVE_THREAD_DEBUGREG0 + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_DEBUGREG0 1 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_DEBUGREG0 1" >>confdefs.h + + HAVE_THREAD_DEBUGREG0=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_DEBUGREG0 0 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_DEBUGREG0 0" >>confdefs.h + + HAVE_THREAD_DEBUGREG0='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for thread.debugregs" >&5 +-echo $ECHO_N "checking kernel for thread.debugregs... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_THREAD_DEBUGREGS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.debugregs" >&5 ++$as_echo_n "checking kernel for thread.debugregs... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_THREAD_DEBUGREGS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -37005,42 +26717,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_DEBUGREGS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_DEBUGREGS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -37048,48 +26736,39 @@ + cr_result=$cr_cv_kconfig_HAVE_THREAD_DEBUGREGS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_DEBUGREGS 1 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_DEBUGREGS 1" >>confdefs.h + + HAVE_THREAD_DEBUGREGS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_DEBUGREGS 0 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_DEBUGREGS 0" >>confdefs.h + + HAVE_THREAD_DEBUGREGS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for thread.i387" >&5 +-echo $ECHO_N "checking kernel for thread.i387... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_THREAD_I387+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.i387" >&5 ++$as_echo_n "checking kernel for thread.i387... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_THREAD_I387+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -37107,42 +26786,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_I387=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_I387=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -37150,48 +26805,39 @@ + cr_result=$cr_cv_kconfig_HAVE_THREAD_I387 + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_I387 1 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_I387 1" >>confdefs.h + + HAVE_THREAD_I387=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_I387 0 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_I387 0" >>confdefs.h + + HAVE_THREAD_I387='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for thread.xstate" >&5 +-echo $ECHO_N "checking kernel for thread.xstate... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_THREAD_XSTATE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for thread.xstate" >&5 ++$as_echo_n "checking kernel for thread.xstate... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_THREAD_XSTATE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -37209,42 +26855,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_XSTATE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_THREAD_XSTATE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -37252,49 +26874,40 @@ + cr_result=$cr_cv_kconfig_HAVE_THREAD_XSTATE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_XSTATE 1 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_XSTATE 1" >>confdefs.h + + HAVE_THREAD_XSTATE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_XSTATE 0 +-_ACEOF ++ $as_echo "#define HAVE_THREAD_XSTATE 0" >>confdefs.h + + HAVE_THREAD_XSTATE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for pt_regs.eflags" >&5 +-echo $ECHO_N "checking kernel for pt_regs.eflags... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PT_REGS_EFLAGS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.eflags" >&5 ++$as_echo_n "checking kernel for pt_regs.eflags... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PT_REGS_EFLAGS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -37312,42 +26925,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_EFLAGS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_EFLAGS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -37355,48 +26944,39 @@ + cr_result=$cr_cv_kconfig_HAVE_PT_REGS_EFLAGS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_EFLAGS 1 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_EFLAGS 1" >>confdefs.h + + HAVE_PT_REGS_EFLAGS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_EFLAGS 0 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_EFLAGS 0" >>confdefs.h + + HAVE_PT_REGS_EFLAGS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for pt_regs.flags" >&5 +-echo $ECHO_N "checking kernel for pt_regs.flags... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PT_REGS_FLAGS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.flags" >&5 ++$as_echo_n "checking kernel for pt_regs.flags... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PT_REGS_FLAGS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -37414,42 +26994,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_FLAGS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_FLAGS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -37457,33 +27013,29 @@ + cr_result=$cr_cv_kconfig_HAVE_PT_REGS_FLAGS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_FLAGS 1 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_FLAGS 1" >>confdefs.h + + HAVE_PT_REGS_FLAGS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_FLAGS 0 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_FLAGS 0" >>confdefs.h + + HAVE_PT_REGS_FLAGS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for init_fpu" >&5 +-echo $ECHO_N "checking kernel symbol table for init_fpu... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_init_fpu+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for init_fpu" >&5 ++$as_echo_n "checking kernel symbol table for init_fpu... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_init_fpu+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_init_fpu=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}init_fpu$/ {s/ .*//p;q;}"` +@@ -37499,11 +27051,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -37523,42 +27071,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_init_fpu="Y$cr_cv_ksymtab_init_fpu" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_init_fpu="N$cr_cv_ksymtab_init_fpu" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -37588,17 +27112,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for xstate_size" >&5 +-echo $ECHO_N "checking kernel symbol table for xstate_size... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_xstate_size+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for xstate_size" >&5 ++$as_echo_n "checking kernel symbol table for xstate_size... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_xstate_size+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_xstate_size=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}xstate_size$/ {s/ .*//p;q;}"` +@@ -37614,11 +27138,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -37638,42 +27158,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_xstate_size="Y$cr_cv_ksymtab_xstate_size" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_xstate_size="N$cr_cv_ksymtab_xstate_size" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -37703,34 +27199,29 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for restore_fpu_checking" >&5 +-echo $ECHO_N "checking kernel for restore_fpu_checking... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for restore_fpu_checking" >&5 ++$as_echo_n "checking kernel for restore_fpu_checking... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -37754,42 +27245,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -37797,49 +27264,40 @@ + cr_result=$cr_cv_kconfig_HAVE_RESTORE_FPU_CHECKING + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_RESTORE_FPU_CHECKING 1 +-_ACEOF ++ $as_echo "#define HAVE_RESTORE_FPU_CHECKING 1" >>confdefs.h + + HAVE_RESTORE_FPU_CHECKING=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_RESTORE_FPU_CHECKING 0 +-_ACEOF ++ $as_echo "#define HAVE_RESTORE_FPU_CHECKING 0" >>confdefs.h + + HAVE_RESTORE_FPU_CHECKING='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -n "${HAVE_RESTORE_FPU_CHECKING}"; then + + + +- +- echo "$as_me:$LINENO: checking kernel for 2.6.0 restore_fpu_checking" >&5 +-echo $ECHO_N "checking kernel for 2.6.0 restore_fpu_checking... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.0 restore_fpu_checking" >&5 ++$as_echo_n "checking kernel for 2.6.0 restore_fpu_checking... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -37857,42 +27315,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -37900,48 +27334,39 @@ + cr_result=$cr_cv_kconfig_HAVE_2_6_0_RESTORE_FPU_CHECKING + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_0_RESTORE_FPU_CHECKING 1 +-_ACEOF ++ $as_echo "#define HAVE_2_6_0_RESTORE_FPU_CHECKING 1" >>confdefs.h + + HAVE_2_6_0_RESTORE_FPU_CHECKING=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_0_RESTORE_FPU_CHECKING 0 +-_ACEOF ++ $as_echo "#define HAVE_2_6_0_RESTORE_FPU_CHECKING 0" >>confdefs.h + + HAVE_2_6_0_RESTORE_FPU_CHECKING='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 2.6.28 restore_fpu_checking" >&5 +-echo $ECHO_N "checking kernel for 2.6.28 restore_fpu_checking... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.28 restore_fpu_checking" >&5 ++$as_echo_n "checking kernel for 2.6.28 restore_fpu_checking... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -37959,42 +27384,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -38002,22 +27403,18 @@ + cr_result=$cr_cv_kconfig_HAVE_2_6_28_RESTORE_FPU_CHECKING + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_28_RESTORE_FPU_CHECKING 1 +-_ACEOF ++ $as_echo "#define HAVE_2_6_28_RESTORE_FPU_CHECKING 1" >>confdefs.h + + HAVE_2_6_28_RESTORE_FPU_CHECKING=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_28_RESTORE_FPU_CHECKING 0 +-_ACEOF ++ $as_echo "#define HAVE_2_6_28_RESTORE_FPU_CHECKING 0" >>confdefs.h + + HAVE_2_6_28_RESTORE_FPU_CHECKING='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test "${HAVE_2_6_0_RESTORE_FPU_CHECKING}${HAVE_2_6_28_RESTORE_FPU_CHECKING}" != "1"; then +@@ -38040,39 +27437,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -38086,39 +27503,32 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call restore_fpu_checking()" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call restore_fpu_checking()" >&2;} +- { (exit 1); exit 1; }; } +- +- fi +- fi +-fi +- +-if test $CR_ARCH = i386; then +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for pt_regs.xcs" >&5 +-echo $ECHO_N "checking kernel for pt_regs.xcs... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PT_REGS_XCS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine how to call restore_fpu_checking()" "$LINENO" 5 ++ ++ fi ++ fi ++fi ++ ++if test $CR_KARCH = i386; then ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.xcs" >&5 ++$as_echo_n "checking kernel for pt_regs.xcs... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PT_REGS_XCS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -38136,42 +27546,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_XCS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_XCS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -38179,48 +27565,39 @@ + cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XCS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_XCS 1 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_XCS 1" >>confdefs.h + + HAVE_PT_REGS_XCS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_XCS 0 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_XCS 0" >>confdefs.h + + HAVE_PT_REGS_XCS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for pt_regs.xfs" >&5 +-echo $ECHO_N "checking kernel for pt_regs.xfs... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PT_REGS_XFS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.xfs" >&5 ++$as_echo_n "checking kernel for pt_regs.xfs... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PT_REGS_XFS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -38238,42 +27615,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_XFS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_XFS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -38281,48 +27634,39 @@ + cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XFS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_XFS 1 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_XFS 1" >>confdefs.h + + HAVE_PT_REGS_XFS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_XFS 0 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_XFS 0" >>confdefs.h + + HAVE_PT_REGS_XFS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for pt_regs.xgs" >&5 +-echo $ECHO_N "checking kernel for pt_regs.xgs... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PT_REGS_XGS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.xgs" >&5 ++$as_echo_n "checking kernel for pt_regs.xgs... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PT_REGS_XGS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -38340,42 +27684,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_XGS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_XGS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -38383,48 +27703,39 @@ + cr_result=$cr_cv_kconfig_HAVE_PT_REGS_XGS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_XGS 1 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_XGS 1" >>confdefs.h + + HAVE_PT_REGS_XGS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_XGS 0 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_XGS 0" >>confdefs.h + + HAVE_PT_REGS_XGS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for pt_regs.cs" >&5 +-echo $ECHO_N "checking kernel for pt_regs.cs... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PT_REGS_CS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.cs" >&5 ++$as_echo_n "checking kernel for pt_regs.cs... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PT_REGS_CS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -38442,42 +27753,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_CS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_CS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -38485,48 +27772,39 @@ + cr_result=$cr_cv_kconfig_HAVE_PT_REGS_CS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_CS 1 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_CS 1" >>confdefs.h + + HAVE_PT_REGS_CS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_CS 0 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_CS 0" >>confdefs.h + + HAVE_PT_REGS_CS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for pt_regs.fs" >&5 +-echo $ECHO_N "checking kernel for pt_regs.fs... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PT_REGS_FS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.fs" >&5 ++$as_echo_n "checking kernel for pt_regs.fs... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PT_REGS_FS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -38544,42 +27822,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_FS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_FS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -38587,48 +27841,39 @@ + cr_result=$cr_cv_kconfig_HAVE_PT_REGS_FS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_FS 1 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_FS 1" >>confdefs.h + + HAVE_PT_REGS_FS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_FS 0 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_FS 0" >>confdefs.h + + HAVE_PT_REGS_FS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for pt_regs.gs" >&5 +-echo $ECHO_N "checking kernel for pt_regs.gs... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PT_REGS_GS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pt_regs.gs" >&5 ++$as_echo_n "checking kernel for pt_regs.gs... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PT_REGS_GS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -38646,42 +27891,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_GS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PT_REGS_GS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -38689,50 +27910,41 @@ + cr_result=$cr_cv_kconfig_HAVE_PT_REGS_GS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_GS 1 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_GS 1" >>confdefs.h + + HAVE_PT_REGS_GS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PT_REGS_GS 0 +-_ACEOF ++ $as_echo "#define HAVE_PT_REGS_GS 0" >>confdefs.h + + HAVE_PT_REGS_GS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for inode sem" >&5 +-echo $ECHO_N "checking kernel for inode sem... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_INODE_SEM+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for inode sem" >&5 ++$as_echo_n "checking kernel for inode sem... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_INODE_SEM+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -38753,42 +27965,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_INODE_SEM=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_INODE_SEM=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -38796,48 +27984,39 @@ + cr_result=$cr_cv_kconfig_HAVE_INODE_SEM + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_INODE_SEM 1 +-_ACEOF ++ $as_echo "#define HAVE_INODE_SEM 1" >>confdefs.h + + HAVE_INODE_SEM=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_INODE_SEM 0 +-_ACEOF ++ $as_echo "#define HAVE_INODE_SEM 0" >>confdefs.h + + HAVE_INODE_SEM='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for inode mutex" >&5 +-echo $ECHO_N "checking kernel for inode mutex... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_INODE_MUTEX+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for inode mutex" >&5 ++$as_echo_n "checking kernel for inode mutex... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_INODE_MUTEX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -38859,42 +28038,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_INODE_MUTEX=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_INODE_MUTEX=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -38902,22 +28057,18 @@ + cr_result=$cr_cv_kconfig_HAVE_INODE_MUTEX + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_INODE_MUTEX 1 +-_ACEOF ++ $as_echo "#define HAVE_INODE_MUTEX 1" >>confdefs.h + + HAVE_INODE_MUTEX=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_INODE_MUTEX 0 +-_ACEOF ++ $as_echo "#define HAVE_INODE_MUTEX 0" >>confdefs.h + + HAVE_INODE_MUTEX='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # Allow exactly one match +@@ -38941,39 +28092,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -38987,36 +28158,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unrecognized lock type for struct inode" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unrecognized lock type for struct inode" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for mm.dumpable" >&5 +-echo $ECHO_N "checking kernel for mm.dumpable... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_MM_DUMPABLE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unrecognized lock type for struct inode" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for mm.dumpable" >&5 ++$as_echo_n "checking kernel for mm.dumpable... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_MM_DUMPABLE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -39034,42 +28198,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_MM_DUMPABLE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_MM_DUMPABLE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -39077,32 +28217,28 @@ + cr_result=$cr_cv_kconfig_HAVE_MM_DUMPABLE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MM_DUMPABLE 1 +-_ACEOF ++ $as_echo "#define HAVE_MM_DUMPABLE 1" >>confdefs.h + + HAVE_MM_DUMPABLE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_MM_DUMPABLE 0 +-_ACEOF ++ $as_echo "#define HAVE_MM_DUMPABLE 0" >>confdefs.h + + HAVE_MM_DUMPABLE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for get_dumpable" >&5 +-echo $ECHO_N "checking kernel symbol table for get_dumpable... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_get_dumpable+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for get_dumpable" >&5 ++$as_echo_n "checking kernel symbol table for get_dumpable... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_get_dumpable+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_get_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}get_dumpable$/ {s/ .*//p;q;}"` +@@ -39118,11 +28254,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -39142,42 +28274,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_get_dumpable="Y$cr_cv_ksymtab_get_dumpable" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_get_dumpable="N$cr_cv_ksymtab_get_dumpable" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -39207,8 +28315,8 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + # Allow one or more match(es) + if test -z "${HAVE_MM_DUMPABLE}${cr_addr}"; then +@@ -39231,39 +28339,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -39277,36 +28405,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to identify non-dumpable tasks" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to identify non-dumpable tasks" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for task.rlim" >&5 +-echo $ECHO_N "checking kernel for task.rlim... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_TASK_RLIM+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine how to identify non-dumpable tasks" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.rlim" >&5 ++$as_echo_n "checking kernel for task.rlim... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_TASK_RLIM+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -39324,42 +28445,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_RLIM=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_RLIM=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -39367,48 +28464,39 @@ + cr_result=$cr_cv_kconfig_HAVE_TASK_RLIM + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_RLIM 1 +-_ACEOF ++ $as_echo "#define HAVE_TASK_RLIM 1" >>confdefs.h + + HAVE_TASK_RLIM=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_RLIM 0 +-_ACEOF ++ $as_echo "#define HAVE_TASK_RLIM 0" >>confdefs.h + + HAVE_TASK_RLIM='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for signal.rlim" >&5 +-echo $ECHO_N "checking kernel for signal.rlim... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_SIGNAL_RLIM+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for signal.rlim" >&5 ++$as_echo_n "checking kernel for signal.rlim... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_SIGNAL_RLIM+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -39426,42 +28514,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_SIGNAL_RLIM=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_SIGNAL_RLIM=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -39469,22 +28533,18 @@ + cr_result=$cr_cv_kconfig_HAVE_SIGNAL_RLIM + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SIGNAL_RLIM 1 +-_ACEOF ++ $as_echo "#define HAVE_SIGNAL_RLIM 1" >>confdefs.h + + HAVE_SIGNAL_RLIM=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SIGNAL_RLIM 0 +-_ACEOF ++ $as_echo "#define HAVE_SIGNAL_RLIM 0" >>confdefs.h + + HAVE_SIGNAL_RLIM='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # Allow exactly one match +@@ -39508,39 +28568,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -39554,36 +28634,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine location of rlim structure" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine location of rlim structure" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for task.cred" >&5 +-echo $ECHO_N "checking kernel for task.cred... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_TASK_CRED+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine location of rlim structure" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.cred" >&5 ++$as_echo_n "checking kernel for task.cred... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_TASK_CRED+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -39601,42 +28674,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_CRED=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_CRED=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -39644,49 +28693,40 @@ + cr_result=$cr_cv_kconfig_HAVE_TASK_CRED + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_CRED 1 +-_ACEOF ++ $as_echo "#define HAVE_TASK_CRED 1" >>confdefs.h + + HAVE_TASK_CRED=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_CRED 0 +-_ACEOF ++ $as_echo "#define HAVE_TASK_CRED 0" >>confdefs.h + + HAVE_TASK_CRED='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for task.group_info" >&5 +-echo $ECHO_N "checking kernel for task.group_info... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_TASK_GROUP_INFO+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.group_info" >&5 ++$as_echo_n "checking kernel for task.group_info... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_TASK_GROUP_INFO+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -39704,42 +28744,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_GROUP_INFO=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_GROUP_INFO=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -39747,48 +28763,39 @@ + cr_result=$cr_cv_kconfig_HAVE_TASK_GROUP_INFO + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_GROUP_INFO 1 +-_ACEOF ++ $as_echo "#define HAVE_TASK_GROUP_INFO 1" >>confdefs.h + + HAVE_TASK_GROUP_INFO=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_GROUP_INFO 0 +-_ACEOF ++ $as_echo "#define HAVE_TASK_GROUP_INFO 0" >>confdefs.h + + HAVE_TASK_GROUP_INFO='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for suid_dumpable" >&5 +-echo $ECHO_N "checking kernel for suid_dumpable... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_SUID_DUMPABLE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for suid_dumpable" >&5 ++$as_echo_n "checking kernel for suid_dumpable... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_SUID_DUMPABLE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -39807,42 +28814,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_SUID_DUMPABLE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_SUID_DUMPABLE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -39850,33 +28833,29 @@ + cr_result=$cr_cv_kconfig_HAVE_SUID_DUMPABLE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SUID_DUMPABLE 1 +-_ACEOF ++ $as_echo "#define HAVE_SUID_DUMPABLE 1" >>confdefs.h + + HAVE_SUID_DUMPABLE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SUID_DUMPABLE 0 +-_ACEOF ++ $as_echo "#define HAVE_SUID_DUMPABLE 0" >>confdefs.h + + HAVE_SUID_DUMPABLE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -n "${HAVE_SUID_DUMPABLE}"; then + + +- echo "$as_me:$LINENO: checking kernel symbol table for suid_dumpable" >&5 +-echo $ECHO_N "checking kernel symbol table for suid_dumpable... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_suid_dumpable+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for suid_dumpable" >&5 ++$as_echo_n "checking kernel symbol table for suid_dumpable... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_suid_dumpable+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_suid_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}suid_dumpable$/ {s/ .*//p;q;}"` +@@ -39892,11 +28871,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -39916,42 +28891,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_suid_dumpable="Y$cr_cv_ksymtab_suid_dumpable" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_suid_dumpable="N$cr_cv_ksymtab_suid_dumpable" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -39962,9 +28913,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_suid_dumpable" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol suid_dumpable but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol suid_dumpable but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol suid_dumpable but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_suid_dumpable | tr -d 'YN'` + if test $cr_result = 0; then +@@ -39980,34 +28929,29 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +-fi +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for set_dumpable" >&5 +-echo $ECHO_N "checking kernel for set_dumpable... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_SET_DUMPABLE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++fi ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for set_dumpable" >&5 ++$as_echo_n "checking kernel for set_dumpable... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_SET_DUMPABLE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -40031,42 +28975,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_SET_DUMPABLE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_SET_DUMPABLE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -40074,33 +28994,29 @@ + cr_result=$cr_cv_kconfig_HAVE_SET_DUMPABLE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SET_DUMPABLE 1 +-_ACEOF ++ $as_echo "#define HAVE_SET_DUMPABLE 1" >>confdefs.h + + HAVE_SET_DUMPABLE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SET_DUMPABLE 0 +-_ACEOF ++ $as_echo "#define HAVE_SET_DUMPABLE 0" >>confdefs.h + + HAVE_SET_DUMPABLE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -n "${HAVE_SET_DUMPABLE}"; then + + +- echo "$as_me:$LINENO: checking kernel symbol table for set_dumpable" >&5 +-echo $ECHO_N "checking kernel symbol table for set_dumpable... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_set_dumpable+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for set_dumpable" >&5 ++$as_echo_n "checking kernel symbol table for set_dumpable... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_set_dumpable+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_set_dumpable=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}set_dumpable$/ {s/ .*//p;q;}"` +@@ -40116,11 +29032,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -40140,42 +29052,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_set_dumpable="Y$cr_cv_ksymtab_set_dumpable" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_set_dumpable="N$cr_cv_ksymtab_set_dumpable" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -40186,9 +29074,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_set_dumpable" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol set_dumpable but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol set_dumpable but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol set_dumpable but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_set_dumpable | tr -d 'YN'` + if test $cr_result = 0; then +@@ -40204,18 +29090,18 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +-fi +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for groups_search" >&5 +-echo $ECHO_N "checking kernel symbol table for groups_search... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_groups_search+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++fi ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for groups_search" >&5 ++$as_echo_n "checking kernel symbol table for groups_search... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_groups_search+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_groups_search=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}groups_search$/ {s/ .*//p;q;}"` +@@ -40231,11 +29117,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -40255,42 +29137,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_groups_search="Y$cr_cv_ksymtab_groups_search" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_groups_search="N$cr_cv_ksymtab_groups_search" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -40320,17 +29178,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for supplemental_group_member" >&5 +-echo $ECHO_N "checking kernel symbol table for supplemental_group_member... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_supplemental_group_member+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for supplemental_group_member" >&5 ++$as_echo_n "checking kernel symbol table for supplemental_group_member... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_supplemental_group_member+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_supplemental_group_member=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}supplemental_group_member$/ {s/ .*//p;q;}"` +@@ -40346,11 +29204,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -40370,42 +29224,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_supplemental_group_member="Y$cr_cv_ksymtab_supplemental_group_member" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_supplemental_group_member="N$cr_cv_ksymtab_supplemental_group_member" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -40435,34 +29265,29 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for PIDTYPE_TGID" >&5 +-echo $ECHO_N "checking kernel for PIDTYPE_TGID... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PIDTYPE_TGID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for PIDTYPE_TGID" >&5 ++$as_echo_n "checking kernel for PIDTYPE_TGID... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PIDTYPE_TGID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -40482,42 +29307,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PIDTYPE_TGID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PIDTYPE_TGID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -40525,48 +29326,39 @@ + cr_result=$cr_cv_kconfig_HAVE_PIDTYPE_TGID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PIDTYPE_TGID 1 +-_ACEOF ++ $as_echo "#define HAVE_PIDTYPE_TGID 1" >>confdefs.h + + HAVE_PIDTYPE_TGID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PIDTYPE_TGID 0 +-_ACEOF ++ $as_echo "#define HAVE_PIDTYPE_TGID 0" >>confdefs.h + + HAVE_PIDTYPE_TGID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for task.thread_group" >&5 +-echo $ECHO_N "checking kernel for task.thread_group... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_TASK_THREAD_GROUP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.thread_group" >&5 ++$as_echo_n "checking kernel for task.thread_group... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_TASK_THREAD_GROUP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -40584,42 +29376,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_THREAD_GROUP=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_THREAD_GROUP=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -40627,22 +29395,18 @@ + cr_result=$cr_cv_kconfig_HAVE_TASK_THREAD_GROUP + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_THREAD_GROUP 1 +-_ACEOF ++ $as_echo "#define HAVE_TASK_THREAD_GROUP 1" >>confdefs.h + + HAVE_TASK_THREAD_GROUP=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_THREAD_GROUP 0 +-_ACEOF ++ $as_echo "#define HAVE_TASK_THREAD_GROUP 0" >>confdefs.h + + HAVE_TASK_THREAD_GROUP='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test "${HAVE_PIDTYPE_TGID}${HAVE_TASK_THREAD_GROUP}" != "1"; then +@@ -40665,39 +29429,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -40711,20 +29495,18 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine thread group list" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine thread group list" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for detach_pid" >&5 +-echo $ECHO_N "checking kernel symbol table for detach_pid... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_detach_pid+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine thread group list" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for detach_pid" >&5 ++$as_echo_n "checking kernel symbol table for detach_pid... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_detach_pid+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_detach_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}detach_pid$/ {s/ .*//p;q;}"` +@@ -40740,11 +29522,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -40764,42 +29542,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_detach_pid="Y$cr_cv_ksymtab_detach_pid" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_detach_pid="N$cr_cv_ksymtab_detach_pid" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -40810,9 +29564,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_detach_pid" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol detach_pid but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol detach_pid but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol detach_pid but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_detach_pid | tr -d 'YN'` + if test $cr_result = 0; then +@@ -40828,17 +29580,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for attach_pid" >&5 +-echo $ECHO_N "checking kernel symbol table for attach_pid... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_attach_pid+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for attach_pid" >&5 ++$as_echo_n "checking kernel symbol table for attach_pid... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_attach_pid+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_attach_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}attach_pid$/ {s/ .*//p;q;}"` +@@ -40854,11 +29606,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -40878,42 +29626,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_attach_pid="Y$cr_cv_ksymtab_attach_pid" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_attach_pid="N$cr_cv_ksymtab_attach_pid" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -40924,9 +29648,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_attach_pid" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol attach_pid but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol attach_pid but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol attach_pid but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_attach_pid | tr -d 'YN'` + if test $cr_result = 0; then +@@ -40942,17 +29664,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for change_pid" >&5 +-echo $ECHO_N "checking kernel symbol table for change_pid... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_change_pid+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for change_pid" >&5 ++$as_echo_n "checking kernel symbol table for change_pid... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_change_pid+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_change_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}change_pid$/ {s/ .*//p;q;}"` +@@ -40968,11 +29690,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -40992,42 +29710,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_change_pid="Y$cr_cv_ksymtab_change_pid" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_change_pid="N$cr_cv_ksymtab_change_pid" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -41038,9 +29732,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_change_pid" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol change_pid but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol change_pid but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol change_pid but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_change_pid | tr -d 'YN'` + if test $cr_result = 0; then +@@ -41056,17 +29748,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for find_pid" >&5 +-echo $ECHO_N "checking kernel symbol table for find_pid... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_find_pid+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for find_pid" >&5 ++$as_echo_n "checking kernel symbol table for find_pid... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_find_pid+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_find_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}find_pid$/ {s/ .*//p;q;}"` +@@ -41082,11 +29774,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -41106,42 +29794,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_find_pid="Y$cr_cv_ksymtab_find_pid" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_find_pid="N$cr_cv_ksymtab_find_pid" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -41152,9 +29816,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_find_pid" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol find_pid but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol find_pid but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol find_pid but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_find_pid | tr -d 'YN'` + if test $cr_result = 0; then +@@ -41170,17 +29832,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for link_pid" >&5 +-echo $ECHO_N "checking kernel symbol table for link_pid... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_link_pid+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for link_pid" >&5 ++$as_echo_n "checking kernel symbol table for link_pid... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_link_pid+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_link_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}link_pid$/ {s/ .*//p;q;}"` +@@ -41196,11 +29858,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -41220,42 +29878,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_link_pid="Y$cr_cv_ksymtab_link_pid" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_link_pid="N$cr_cv_ksymtab_link_pid" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -41266,9 +29900,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_link_pid" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol link_pid but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol link_pid but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol link_pid but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_link_pid | tr -d 'YN'` + if test $cr_result = 0; then +@@ -41284,37 +29916,32 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 1-arg find_pid" >&5 +-echo $ECHO_N "checking kernel for 1-arg find_pid... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_1_ARG_FIND_PID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 1-arg find_pid" >&5 ++$as_echo_n "checking kernel for 1-arg find_pid... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_1_ARG_FIND_PID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -41335,42 +29962,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_1_ARG_FIND_PID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_1_ARG_FIND_PID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -41378,52 +29981,43 @@ + cr_result=$cr_cv_kconfig_HAVE_1_ARG_FIND_PID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_1_ARG_FIND_PID 1 +-_ACEOF ++ $as_echo "#define HAVE_1_ARG_FIND_PID 1" >>confdefs.h + + HAVE_1_ARG_FIND_PID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_1_ARG_FIND_PID 0 +-_ACEOF ++ $as_echo "#define HAVE_1_ARG_FIND_PID 0" >>confdefs.h + + HAVE_1_ARG_FIND_PID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 2-arg find_pid" >&5 +-echo $ECHO_N "checking kernel for 2-arg find_pid... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_2_ARG_FIND_PID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg find_pid" >&5 ++$as_echo_n "checking kernel for 2-arg find_pid... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_2_ARG_FIND_PID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -41444,42 +30038,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_ARG_FIND_PID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_ARG_FIND_PID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -41487,50 +30057,41 @@ + cr_result=$cr_cv_kconfig_HAVE_2_ARG_FIND_PID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_ARG_FIND_PID 1 +-_ACEOF ++ $as_echo "#define HAVE_2_ARG_FIND_PID 1" >>confdefs.h + + HAVE_2_ARG_FIND_PID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_ARG_FIND_PID 0 +-_ACEOF ++ $as_echo "#define HAVE_2_ARG_FIND_PID 0" >>confdefs.h + + HAVE_2_ARG_FIND_PID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for find_pid_ns" >&5 +-echo $ECHO_N "checking kernel for find_pid_ns... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_FIND_PID_NS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_pid_ns" >&5 ++$as_echo_n "checking kernel for find_pid_ns... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_FIND_PID_NS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -41554,42 +30115,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FIND_PID_NS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FIND_PID_NS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -41597,22 +30134,18 @@ + cr_result=$cr_cv_kconfig_HAVE_FIND_PID_NS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FIND_PID_NS 1 +-_ACEOF ++ $as_echo "#define HAVE_FIND_PID_NS 1" >>confdefs.h + + HAVE_FIND_PID_NS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FIND_PID_NS 0 +-_ACEOF ++ $as_echo "#define HAVE_FIND_PID_NS 0" >>confdefs.h + + HAVE_FIND_PID_NS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -z "${HAVE_1_ARG_FIND_PID}${HAVE_2_ARG_FIND_PID}${HAVE_FIND_PID_NS}"; then +@@ -41635,39 +30168,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -41681,36 +30234,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct pid" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct pid" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for find_task_by_pid" >&5 +-echo $ECHO_N "checking kernel for find_task_by_pid... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct pid" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_task_by_pid" >&5 ++$as_echo_n "checking kernel for find_task_by_pid... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -41734,42 +30280,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FIND_TASK_BY_PID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FIND_TASK_BY_PID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -41777,48 +30299,39 @@ + cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FIND_TASK_BY_PID 1 +-_ACEOF ++ $as_echo "#define HAVE_FIND_TASK_BY_PID 1" >>confdefs.h + + HAVE_FIND_TASK_BY_PID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FIND_TASK_BY_PID 0 +-_ACEOF ++ $as_echo "#define HAVE_FIND_TASK_BY_PID 0" >>confdefs.h + + HAVE_FIND_TASK_BY_PID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for find_task_by_pid_ns" >&5 +-echo $ECHO_N "checking kernel for find_task_by_pid_ns... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_task_by_pid_ns" >&5 ++$as_echo_n "checking kernel for find_task_by_pid_ns... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -41842,42 +30355,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -41885,22 +30374,18 @@ + cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_NS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FIND_TASK_BY_PID_NS 1 +-_ACEOF ++ $as_echo "#define HAVE_FIND_TASK_BY_PID_NS 1" >>confdefs.h + + HAVE_FIND_TASK_BY_PID_NS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FIND_TASK_BY_PID_NS 0 +-_ACEOF ++ $as_echo "#define HAVE_FIND_TASK_BY_PID_NS 0" >>confdefs.h + + HAVE_FIND_TASK_BY_PID_NS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -z "${HAVE_FIND_TASK_BY_PID}${HAVE_FIND_TASK_BY_PID_NS}"; then +@@ -41923,39 +30408,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -41969,36 +30474,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct task" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct task" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for find_task_by_pid_type" >&5 +-echo $ECHO_N "checking kernel for find_task_by_pid_type... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine how to map pid_nr -> struct task" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_task_by_pid_type" >&5 ++$as_echo_n "checking kernel for find_task_by_pid_type... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -42022,42 +30520,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -42065,48 +30539,39 @@ + cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FIND_TASK_BY_PID_TYPE 1 +-_ACEOF ++ $as_echo "#define HAVE_FIND_TASK_BY_PID_TYPE 1" >>confdefs.h + + HAVE_FIND_TASK_BY_PID_TYPE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FIND_TASK_BY_PID_TYPE 0 +-_ACEOF ++ $as_echo "#define HAVE_FIND_TASK_BY_PID_TYPE 0" >>confdefs.h + + HAVE_FIND_TASK_BY_PID_TYPE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for find_task_by_pid_type_ns" >&5 +-echo $ECHO_N "checking kernel for find_task_by_pid_type_ns... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for find_task_by_pid_type_ns" >&5 ++$as_echo_n "checking kernel for find_task_by_pid_type_ns... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -42130,42 +30595,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -42173,22 +30614,18 @@ + cr_result=$cr_cv_kconfig_HAVE_FIND_TASK_BY_PID_TYPE_NS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FIND_TASK_BY_PID_TYPE_NS 1 +-_ACEOF ++ $as_echo "#define HAVE_FIND_TASK_BY_PID_TYPE_NS 1" >>confdefs.h + + HAVE_FIND_TASK_BY_PID_TYPE_NS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FIND_TASK_BY_PID_TYPE_NS 0 +-_ACEOF ++ $as_echo "#define HAVE_FIND_TASK_BY_PID_TYPE_NS 0" >>confdefs.h + + HAVE_FIND_TASK_BY_PID_TYPE_NS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -z "${HAVE_2_ARG_FIND_PID}${HAVE_FIND_TASK_BY_PID}${HAVE_FIND_TASK_BY_PID_NS}"; then +@@ -42211,39 +30648,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -42257,36 +30714,113 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to map (type, pid_nr) -> struct task" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to map (type, pid_nr) -> struct task" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for alloc_pid" >&5 +-echo $ECHO_N "checking kernel for alloc_pid... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_ALLOC_PID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine how to map (type, pid_nr) -> struct task" "$LINENO" 5 ++ ++fi ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for find_task_by_pid_ns" >&5 ++$as_echo_n "checking kernel symbol table for find_task_by_pid_ns... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_find_task_by_pid_ns+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ cr_cv_ksymtab_find_task_by_pid_ns=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}find_task_by_pid_ns$/ {s/ .*//p;q;}"` ++ if test -n "$cr_cv_ksymtab_find_task_by_pid_ns"; then ++ if eval $LINUX_SYMTAB_CMD | grep " __ksymtab_find_task_by_pid_ns\$" >/dev/null ; then ++ cr_cv_ksymtab_find_task_by_pid_ns=0 ++ fi ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++ #include ++ #ifndef FASTCALL ++ #define FASTCALL(_decl) _decl ++ #endif ++ #include ++ ++ #define IN_CONFIGURE 1 ++ #include "${TOP_SRCDIR}/include/blcr_imports.h.in" ++ ++int ++main () ++{ ++int x = sizeof(&find_task_by_pid_ns); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ CC=$SAVE_CC ++ CFLAGS=$SAVE_CFLAGS ++ CPPFLAGS=$SAVE_CPPFLAGS ++ cr_cv_ksymtab_find_task_by_pid_ns="Y$cr_cv_ksymtab_find_task_by_pid_ns" ++else ++ CC=$SAVE_CC ++ CFLAGS=$SAVE_CFLAGS ++ CPPFLAGS=$SAVE_CPPFLAGS ++ cr_cv_ksymtab_find_task_by_pid_ns="N$cr_cv_ksymtab_find_task_by_pid_ns" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++ fi ++ ++fi ++ ++ cr_addr='' ++ if test -z "$cr_cv_ksymtab_find_task_by_pid_ns"; then ++ cr_result='not found' ++ else ++ if expr "$cr_cv_ksymtab_find_task_by_pid_ns" : N >/dev/null; then ++ as_fn_error "Found symbol find_task_by_pid_ns but no declaration -- please file a bug report." "$LINENO" 5 ++ fi ++ cr_result=`echo $cr_cv_ksymtab_find_task_by_pid_ns | tr -d 'YN'` ++ if test $cr_result = 0; then ++ cr_result=exported ++ cr_addr=0 ++ else ++ cr_addr="0x$cr_result" ++ echo "_CR_IMPORT_KCODE(find_task_by_pid_ns, $cr_addr)" >>$CR_KSYM_IMPORT_CALLS ++ fi ++ ++cat >>confdefs.h <<_ACEOF ++#define CR_KCODE_find_task_by_pid_ns $cr_addr ++_ACEOF ++ ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for alloc_pid" >&5 ++$as_echo_n "checking kernel for alloc_pid... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_ALLOC_PID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -42310,42 +30844,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_ALLOC_PID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_ALLOC_PID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -42353,22 +30863,18 @@ + cr_result=$cr_cv_kconfig_HAVE_ALLOC_PID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_ALLOC_PID 1 +-_ACEOF ++ $as_echo "#define HAVE_ALLOC_PID 1" >>confdefs.h + + HAVE_ALLOC_PID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_ALLOC_PID 0 +-_ACEOF ++ $as_echo "#define HAVE_ALLOC_PID 0" >>confdefs.h + + HAVE_ALLOC_PID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -n "${HAVE_ALLOC_PID}"; then +@@ -42378,27 +30884,22 @@ + + + +- +- echo "$as_me:$LINENO: checking kernel for 0-arg alloc_pid" >&5 +-echo $ECHO_N "checking kernel for 0-arg alloc_pid... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 0-arg alloc_pid" >&5 ++$as_echo_n "checking kernel for 0-arg alloc_pid... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -42419,42 +30920,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -42462,52 +30939,43 @@ + cr_result=$cr_cv_kconfig_HAVE_0_ARG_ALLOC_PID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_0_ARG_ALLOC_PID 1 +-_ACEOF ++ $as_echo "#define HAVE_0_ARG_ALLOC_PID 1" >>confdefs.h + + HAVE_0_ARG_ALLOC_PID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_0_ARG_ALLOC_PID 0 +-_ACEOF ++ $as_echo "#define HAVE_0_ARG_ALLOC_PID 0" >>confdefs.h + + HAVE_0_ARG_ALLOC_PID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 1-arg alloc_pid" >&5 +-echo $ECHO_N "checking kernel for 1-arg alloc_pid... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 1-arg alloc_pid" >&5 ++$as_echo_n "checking kernel for 1-arg alloc_pid... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -42528,42 +30996,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -42571,22 +31015,18 @@ + cr_result=$cr_cv_kconfig_HAVE_1_ARG_ALLOC_PID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_1_ARG_ALLOC_PID 1 +-_ACEOF ++ $as_echo "#define HAVE_1_ARG_ALLOC_PID 1" >>confdefs.h + + HAVE_1_ARG_ALLOC_PID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_1_ARG_ALLOC_PID 0 +-_ACEOF ++ $as_echo "#define HAVE_1_ARG_ALLOC_PID 0" >>confdefs.h + + HAVE_1_ARG_ALLOC_PID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + +@@ -42611,39 +31051,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -42657,19 +31117,17 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call alloc_pid()" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call alloc_pid()" >&2;} +- { (exit 1); exit 1; }; } +- +- fi +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for free_pid" >&5 +-echo $ECHO_N "checking kernel symbol table for free_pid... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_free_pid+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine how to call alloc_pid()" "$LINENO" 5 ++ ++ fi ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for free_pid" >&5 ++$as_echo_n "checking kernel symbol table for free_pid... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_free_pid+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_free_pid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}free_pid$/ {s/ .*//p;q;}"` +@@ -42685,11 +31143,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -42709,42 +31163,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_free_pid="Y$cr_cv_ksymtab_free_pid" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_free_pid="N$cr_cv_ksymtab_free_pid" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -42755,9 +31185,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_free_pid" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol free_pid but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol free_pid but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol free_pid but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_free_pid | tr -d 'YN'` + if test $cr_result = 0; then +@@ -42773,17 +31201,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for pid_hash" >&5 +-echo $ECHO_N "checking kernel symbol table for pid_hash... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_pid_hash+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pid_hash" >&5 ++$as_echo_n "checking kernel symbol table for pid_hash... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_pid_hash+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_pid_hash=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pid_hash$/ {s/ .*//p;q;}"` +@@ -42799,11 +31227,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -42823,42 +31247,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_pid_hash="Y$cr_cv_ksymtab_pid_hash" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_pid_hash="N$cr_cv_ksymtab_pid_hash" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -42888,17 +31288,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for pidhash_shift" >&5 +-echo $ECHO_N "checking kernel symbol table for pidhash_shift... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_pidhash_shift+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pidhash_shift" >&5 ++$as_echo_n "checking kernel symbol table for pidhash_shift... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_pidhash_shift+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_pidhash_shift=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidhash_shift$/ {s/ .*//p;q;}"` +@@ -42914,11 +31314,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -42938,42 +31334,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_pidhash_shift="Y$cr_cv_ksymtab_pidhash_shift" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_pidhash_shift="N$cr_cv_ksymtab_pidhash_shift" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -43003,34 +31375,29 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + # Can't use true type because 'struct kmem_cache' is opaque by design + + + +- +- echo "$as_me:$LINENO: checking kernel for pid_namespace.pid_cachep" >&5 +-echo $ECHO_N "checking kernel for pid_namespace.pid_cachep... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pid_namespace.pid_cachep" >&5 ++$as_echo_n "checking kernel for pid_namespace.pid_cachep... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -43051,42 +31418,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -43094,32 +31437,28 @@ + cr_result=$cr_cv_kconfig_HAVE_PID_NAMESPACE_PID_CACHEP + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PID_NAMESPACE_PID_CACHEP 1 +-_ACEOF ++ $as_echo "#define HAVE_PID_NAMESPACE_PID_CACHEP 1" >>confdefs.h + + HAVE_PID_NAMESPACE_PID_CACHEP=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PID_NAMESPACE_PID_CACHEP 0 +-_ACEOF ++ $as_echo "#define HAVE_PID_NAMESPACE_PID_CACHEP 0" >>confdefs.h + + HAVE_PID_NAMESPACE_PID_CACHEP='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for pid_cachep" >&5 +-echo $ECHO_N "checking kernel symbol table for pid_cachep... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_pid_cachep+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pid_cachep" >&5 ++$as_echo_n "checking kernel symbol table for pid_cachep... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_pid_cachep+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_pid_cachep=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pid_cachep$/ {s/ .*//p;q;}"` +@@ -43135,11 +31474,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -43159,42 +31494,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_pid_cachep="Y$cr_cv_ksymtab_pid_cachep" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_pid_cachep="N$cr_cv_ksymtab_pid_cachep" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -43230,8 +31541,8 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + if test -z "${cr_addr}${HAVE_PID_NAMESPACE_PID_CACHEP}"; then + +@@ -43253,39 +31564,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -43299,20 +31630,18 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine where to find pid_cachep" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine where to find pid_cachep" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine where to find pid_cachep" "$LINENO" 5 + + fi + if test -n "${HAVE_LINUX_PSPACE_H}"; then + + +- echo "$as_me:$LINENO: checking kernel symbol table for init_pspace" >&5 +-echo $ECHO_N "checking kernel symbol table for init_pspace... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_init_pspace+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for init_pspace" >&5 ++$as_echo_n "checking kernel symbol table for init_pspace... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_init_pspace+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_init_pspace=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}init_pspace$/ {s/ .*//p;q;}"` +@@ -43328,11 +31657,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -43352,42 +31677,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_init_pspace="Y$cr_cv_ksymtab_init_pspace" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_init_pspace="N$cr_cv_ksymtab_init_pspace" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -43398,9 +31699,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_init_pspace" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol init_pspace but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol init_pspace but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol init_pspace but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_init_pspace | tr -d 'YN'` + if test $cr_result = 0; then +@@ -43416,18 +31715,18 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + elif test -n "${HAVE_LINUX_PID_NAMESPACE_H}"; then + + +- echo "$as_me:$LINENO: checking kernel symbol table for init_pid_ns" >&5 +-echo $ECHO_N "checking kernel symbol table for init_pid_ns... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_init_pid_ns+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for init_pid_ns" >&5 ++$as_echo_n "checking kernel symbol table for init_pid_ns... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_init_pid_ns+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_init_pid_ns=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}init_pid_ns$/ {s/ .*//p;q;}"` +@@ -43443,11 +31742,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -43467,42 +31762,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_init_pid_ns="Y$cr_cv_ksymtab_init_pid_ns" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_init_pid_ns="N$cr_cv_ksymtab_init_pid_ns" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -43513,9 +31784,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_init_pid_ns" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol init_pid_ns but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol init_pid_ns but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol init_pid_ns but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_init_pid_ns | tr -d 'YN'` + if test $cr_result = 0; then +@@ -43531,36 +31800,31 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- fi +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 2.6.0 attach_pid" >&5 +-echo $ECHO_N "checking kernel for 2.6.0 attach_pid... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ fi ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.0 attach_pid" >&5 ++$as_echo_n "checking kernel for 2.6.0 attach_pid... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -43579,42 +31843,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -43622,48 +31862,39 @@ + cr_result=$cr_cv_kconfig_HAVE_2_6_0_ATTACH_PID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_0_ATTACH_PID 1 +-_ACEOF ++ $as_echo "#define HAVE_2_6_0_ATTACH_PID 1" >>confdefs.h + + HAVE_2_6_0_ATTACH_PID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_0_ATTACH_PID 0 +-_ACEOF ++ $as_echo "#define HAVE_2_6_0_ATTACH_PID 0" >>confdefs.h + + HAVE_2_6_0_ATTACH_PID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 2.6.22 attach_pid" >&5 +-echo $ECHO_N "checking kernel for 2.6.22 attach_pid... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.22 attach_pid" >&5 ++$as_echo_n "checking kernel for 2.6.22 attach_pid... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -43682,42 +31913,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -43725,48 +31932,39 @@ + cr_result=$cr_cv_kconfig_HAVE_2_6_22_ATTACH_PID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_22_ATTACH_PID 1 +-_ACEOF ++ $as_echo "#define HAVE_2_6_22_ATTACH_PID 1" >>confdefs.h + + HAVE_2_6_22_ATTACH_PID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_22_ATTACH_PID 0 +-_ACEOF ++ $as_echo "#define HAVE_2_6_22_ATTACH_PID 0" >>confdefs.h + + HAVE_2_6_22_ATTACH_PID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 2.6.26 attach_pid" >&5 +-echo $ECHO_N "checking kernel for 2.6.26 attach_pid... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2.6.26 attach_pid" >&5 ++$as_echo_n "checking kernel for 2.6.26 attach_pid... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -43785,42 +31983,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -43828,22 +32002,18 @@ + cr_result=$cr_cv_kconfig_HAVE_2_6_26_ATTACH_PID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_26_ATTACH_PID 1 +-_ACEOF ++ $as_echo "#define HAVE_2_6_26_ATTACH_PID 1" >>confdefs.h + + HAVE_2_6_26_ATTACH_PID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_6_26_ATTACH_PID 0 +-_ACEOF ++ $as_echo "#define HAVE_2_6_26_ATTACH_PID 0" >>confdefs.h + + HAVE_2_6_26_ATTACH_PID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + +@@ -43868,39 +32038,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -43914,36 +32104,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call attach_pid()" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call attach_pid()" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for change_pid" >&5 +-echo $ECHO_N "checking kernel for change_pid... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_CHANGE_PID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine how to call attach_pid()" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for change_pid" >&5 ++$as_echo_n "checking kernel for change_pid... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_CHANGE_PID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -43969,42 +32152,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_CHANGE_PID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_CHANGE_PID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -44012,22 +32171,18 @@ + cr_result=$cr_cv_kconfig_HAVE_CHANGE_PID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_CHANGE_PID 1 +-_ACEOF ++ $as_echo "#define HAVE_CHANGE_PID 1" >>confdefs.h + + HAVE_CHANGE_PID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_CHANGE_PID 0 +-_ACEOF ++ $as_echo "#define HAVE_CHANGE_PID 0" >>confdefs.h + + HAVE_CHANGE_PID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # OK if missing +@@ -44035,27 +32190,22 @@ + + + +- +- echo "$as_me:$LINENO: checking kernel for struct pidmap" >&5 +-echo $ECHO_N "checking kernel for struct pidmap... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_STRUCT_PIDMAP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for struct pidmap" >&5 ++$as_echo_n "checking kernel for struct pidmap... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_STRUCT_PIDMAP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -44082,42 +32232,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_STRUCT_PIDMAP=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_STRUCT_PIDMAP=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -44125,32 +32251,28 @@ + cr_result=$cr_cv_kconfig_HAVE_STRUCT_PIDMAP + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRUCT_PIDMAP 1 +-_ACEOF ++ $as_echo "#define HAVE_STRUCT_PIDMAP 1" >>confdefs.h + + HAVE_STRUCT_PIDMAP=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRUCT_PIDMAP 0 +-_ACEOF ++ $as_echo "#define HAVE_STRUCT_PIDMAP 0" >>confdefs.h + + HAVE_STRUCT_PIDMAP='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for pidmap_array" >&5 +-echo $ECHO_N "checking kernel symbol table for pidmap_array... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_pidmap_array+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pidmap_array" >&5 ++$as_echo_n "checking kernel symbol table for pidmap_array... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_pidmap_array+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_pidmap_array=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidmap_array$/ {s/ .*//p;q;}"` +@@ -44166,11 +32288,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -44190,42 +32308,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_pidmap_array="Y$cr_cv_ksymtab_pidmap_array" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_pidmap_array="N$cr_cv_ksymtab_pidmap_array" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -44263,18 +32357,18 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + if test x"$cr_kernel_smp" = xyes; then + + +- echo "$as_me:$LINENO: checking kernel symbol table for pidmap_lock" >&5 +-echo $ECHO_N "checking kernel symbol table for pidmap_lock... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_pidmap_lock+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for pidmap_lock" >&5 ++$as_echo_n "checking kernel symbol table for pidmap_lock... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_pidmap_lock+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_pidmap_lock=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}pidmap_lock$/ {s/ .*//p;q;}"` +@@ -44290,11 +32384,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -44314,42 +32404,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_pidmap_lock="Y$cr_cv_ksymtab_pidmap_lock" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_pidmap_lock="N$cr_cv_ksymtab_pidmap_lock" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -44379,40 +32445,33 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + if test -z "$cr_addr"; then +- { { echo "$as_me:$LINENO: error: failed to find symbol pidmap_lock" >&5 +-echo "$as_me: error: failed to find symbol pidmap_lock" >&2;} +- { (exit 1); exit 1; }; } +- fi +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for kill_pid" >&5 +-echo $ECHO_N "checking kernel for kill_pid... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_KILL_PID+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "failed to find symbol pidmap_lock" "$LINENO" 5 ++ fi ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kill_pid" >&5 ++$as_echo_n "checking kernel for kill_pid... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_KILL_PID+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -44436,42 +32495,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_KILL_PID=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_KILL_PID=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -44479,48 +32514,39 @@ + cr_result=$cr_cv_kconfig_HAVE_KILL_PID + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_KILL_PID 1 +-_ACEOF ++ $as_echo "#define HAVE_KILL_PID 1" >>confdefs.h + + HAVE_KILL_PID=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_KILL_PID 0 +-_ACEOF ++ $as_echo "#define HAVE_KILL_PID 0" >>confdefs.h + + HAVE_KILL_PID='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for kill_proc" >&5 +-echo $ECHO_N "checking kernel for kill_proc... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_KILL_PROC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kill_proc" >&5 ++$as_echo_n "checking kernel for kill_proc... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_KILL_PROC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -44544,42 +32570,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_KILL_PROC=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_KILL_PROC=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -44587,22 +32589,18 @@ + cr_result=$cr_cv_kconfig_HAVE_KILL_PROC + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_KILL_PROC 1 +-_ACEOF ++ $as_echo "#define HAVE_KILL_PROC 1" >>confdefs.h + + HAVE_KILL_PROC=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_KILL_PROC 0 +-_ACEOF ++ $as_echo "#define HAVE_KILL_PROC 0" >>confdefs.h + + HAVE_KILL_PROC='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # Require at least one +@@ -44626,39 +32624,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -44672,36 +32690,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to find kill_pid() or kill_proc()" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to find kill_pid() or kill_proc()" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for child_reaper" >&5 +-echo $ECHO_N "checking kernel for child_reaper... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_CHILD_REAPER+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to find kill_pid() or kill_proc()" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for child_reaper" >&5 ++$as_echo_n "checking kernel for child_reaper... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_CHILD_REAPER+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -44725,42 +32736,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_CHILD_REAPER=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_CHILD_REAPER=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -44768,48 +32755,39 @@ + cr_result=$cr_cv_kconfig_HAVE_CHILD_REAPER + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_CHILD_REAPER 1 +-_ACEOF ++ $as_echo "#define HAVE_CHILD_REAPER 1" >>confdefs.h + + HAVE_CHILD_REAPER=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_CHILD_REAPER 0 +-_ACEOF ++ $as_echo "#define HAVE_CHILD_REAPER 0" >>confdefs.h + + HAVE_CHILD_REAPER='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for task_child_reaper" >&5 +-echo $ECHO_N "checking kernel for task_child_reaper... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_TASK_CHILD_REAPER+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task_child_reaper" >&5 ++$as_echo_n "checking kernel for task_child_reaper... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_TASK_CHILD_REAPER+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -44833,42 +32811,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_CHILD_REAPER=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_CHILD_REAPER=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -44876,33 +32830,29 @@ + cr_result=$cr_cv_kconfig_HAVE_TASK_CHILD_REAPER + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_CHILD_REAPER 1 +-_ACEOF ++ $as_echo "#define HAVE_TASK_CHILD_REAPER 1" >>confdefs.h + + HAVE_TASK_CHILD_REAPER=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_CHILD_REAPER 0 +-_ACEOF ++ $as_echo "#define HAVE_TASK_CHILD_REAPER 0" >>confdefs.h + + HAVE_TASK_CHILD_REAPER='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -z "${HAVE_CHILD_REAPER}${HAVE_TASK_CHILD_REAPER}"; then + + +- echo "$as_me:$LINENO: checking kernel symbol table for child_reaper" >&5 +-echo $ECHO_N "checking kernel symbol table for child_reaper... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_child_reaper+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for child_reaper" >&5 ++$as_echo_n "checking kernel symbol table for child_reaper... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_child_reaper+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_child_reaper=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}child_reaper$/ {s/ .*//p;q;}"` +@@ -44918,11 +32868,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -44942,42 +32888,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_child_reaper="Y$cr_cv_ksymtab_child_reaper" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_child_reaper="N$cr_cv_ksymtab_child_reaper" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -45007,35 +32929,30 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for task.parent" >&5 +-echo $ECHO_N "checking kernel for task.parent... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_TASK_PARENT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.parent" >&5 ++$as_echo_n "checking kernel for task.parent... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_TASK_PARENT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -45053,42 +32970,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_PARENT=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_PARENT=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -45096,48 +32989,39 @@ + cr_result=$cr_cv_kconfig_HAVE_TASK_PARENT + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_PARENT 1 +-_ACEOF ++ $as_echo "#define HAVE_TASK_PARENT 1" >>confdefs.h + + HAVE_TASK_PARENT=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_PARENT 0 +-_ACEOF ++ $as_echo "#define HAVE_TASK_PARENT 0" >>confdefs.h + + HAVE_TASK_PARENT='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for task.real_parent" >&5 +-echo $ECHO_N "checking kernel for task.real_parent... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_TASK_REAL_PARENT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.real_parent" >&5 ++$as_echo_n "checking kernel for task.real_parent... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_TASK_REAL_PARENT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -45155,42 +33039,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_REAL_PARENT=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_REAL_PARENT=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -45198,47 +33058,39 @@ + cr_result=$cr_cv_kconfig_HAVE_TASK_REAL_PARENT + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_REAL_PARENT 1 +-_ACEOF ++ $as_echo "#define HAVE_TASK_REAL_PARENT 1" >>confdefs.h + + HAVE_TASK_REAL_PARENT=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_REAL_PARENT 0 +-_ACEOF ++ $as_echo "#define HAVE_TASK_REAL_PARENT 0" >>confdefs.h + + HAVE_TASK_REAL_PARENT='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + + # Look for non-deprecated "typedef struct SOMETHING kmem_cache_t". + # This is slightly complicated by the fact that this is an opaque type (with + # the struct itself forward-declared but not defined in the public headers). +-echo "$as_me:$LINENO: checking kernel for kmem_cache_t" >&5 +-echo $ECHO_N "checking kernel for kmem_cache_t... $ECHO_C" >&6 +-if test "${cr_cv_kconfig_HAVE_KMEM_CACHE_T+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kmem_cache_t" >&5 ++$as_echo_n "checking kernel for kmem_cache_t... " >&6; } ++if test "${cr_cv_kconfig_HAVE_KMEM_CACHE_T+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -45255,28 +33107,7 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS +@@ -45288,11 +33119,7 @@ + SAVE_CPPFLAGS=$CPPFLAGS + CPP="$KCC -E" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -45303,7 +33130,7 @@ + #include + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "typedef.+[[:space:]]kmem_cache_t[[:space:]].+deprecated" >/dev/null 2>&1; then ++ $EGREP "typedef.+[[:space:]]kmem_cache_t[[:space:]].+deprecated" >/dev/null 2>&1; then : + CPP=$SAVE_CPP + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_KMEM_CACHE_T=no +@@ -45318,60 +33145,47 @@ + # Want *not* found + + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_KMEM_CACHE_T=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- +- +-fi +-echo "$as_me:$LINENO: result: $cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&5 +-echo "${ECHO_T}$cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&6 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&5 ++$as_echo "$cr_cv_kconfig_HAVE_KMEM_CACHE_T" >&6; } + + if test x$cr_cv_kconfig_HAVE_KMEM_CACHE_T = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_KMEM_CACHE_T 1 +-_ACEOF +- +- else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_KMEM_CACHE_T 0 +-_ACEOF +- +- fi +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for gfp_t" >&5 +-echo $ECHO_N "checking kernel for gfp_t... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_GFP_T+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ $as_echo "#define HAVE_KMEM_CACHE_T 1" >>confdefs.h ++ ++ else ++ $as_echo "#define HAVE_KMEM_CACHE_T 0" >>confdefs.h ++ ++ fi ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for gfp_t" >&5 ++$as_echo_n "checking kernel for gfp_t... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_GFP_T+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -45391,42 +33205,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_GFP_T=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_GFP_T=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -45434,49 +33224,40 @@ + cr_result=$cr_cv_kconfig_HAVE_GFP_T + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_GFP_T 1 +-_ACEOF ++ $as_echo "#define HAVE_GFP_T 1" >>confdefs.h + + HAVE_GFP_T=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_GFP_T 0 +-_ACEOF ++ $as_echo "#define HAVE_GFP_T 0" >>confdefs.h + + HAVE_GFP_T='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # OK if missing + + + +- +- echo "$as_me:$LINENO: checking kernel for kzalloc" >&5 +-echo $ECHO_N "checking kernel for kzalloc... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_KZALLOC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kzalloc" >&5 ++$as_echo_n "checking kernel for kzalloc... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_KZALLOC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -45500,42 +33281,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_KZALLOC=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_KZALLOC=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -45543,49 +33300,40 @@ + cr_result=$cr_cv_kconfig_HAVE_KZALLOC + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_KZALLOC 1 +-_ACEOF ++ $as_echo "#define HAVE_KZALLOC 1" >>confdefs.h + + HAVE_KZALLOC=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_KZALLOC 0 +-_ACEOF ++ $as_echo "#define HAVE_KZALLOC 0" >>confdefs.h + + HAVE_KZALLOC='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # OK if missing + + + +- +- echo "$as_me:$LINENO: checking kernel for kmem_cache_zalloc" >&5 +-echo $ECHO_N "checking kernel for kmem_cache_zalloc... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kmem_cache_zalloc" >&5 ++$as_echo_n "checking kernel for kmem_cache_zalloc... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -45609,42 +33357,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -45652,49 +33376,40 @@ + cr_result=$cr_cv_kconfig_HAVE_KMEM_CACHE_ZALLOC + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_KMEM_CACHE_ZALLOC 1 +-_ACEOF ++ $as_echo "#define HAVE_KMEM_CACHE_ZALLOC 1" >>confdefs.h + + HAVE_KMEM_CACHE_ZALLOC=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_KMEM_CACHE_ZALLOC 0 +-_ACEOF ++ $as_echo "#define HAVE_KMEM_CACHE_ZALLOC 0" >>confdefs.h + + HAVE_KMEM_CACHE_ZALLOC='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # OK if missing + + + +- +- echo "$as_me:$LINENO: checking kernel for kmemdup" >&5 +-echo $ECHO_N "checking kernel for kmemdup... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_KMEMDUP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for kmemdup" >&5 ++$as_echo_n "checking kernel for kmemdup... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_KMEMDUP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -45718,42 +33433,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_KMEMDUP=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_KMEMDUP=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -45761,22 +33452,18 @@ + cr_result=$cr_cv_kconfig_HAVE_KMEMDUP + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_KMEMDUP 1 +-_ACEOF ++ $as_echo "#define HAVE_KMEMDUP 1" >>confdefs.h + + HAVE_KMEMDUP=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_KMEMDUP 0 +-_ACEOF ++ $as_echo "#define HAVE_KMEMDUP 0" >>confdefs.h + + HAVE_KMEMDUP='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # OK if missing +@@ -45784,27 +33471,22 @@ + + + +- +- echo "$as_me:$LINENO: checking kernel for pipe_inode_info.base" >&5 +-echo $ECHO_N "checking kernel for pipe_inode_info.base... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pipe_inode_info.base" >&5 ++$as_echo_n "checking kernel for pipe_inode_info.base... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -45825,42 +33507,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -45868,49 +33526,40 @@ + cr_result=$cr_cv_kconfig_HAVE_PIPE_INODE_INFO_BASE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PIPE_INODE_INFO_BASE 1 +-_ACEOF ++ $as_echo "#define HAVE_PIPE_INODE_INFO_BASE 1" >>confdefs.h + + HAVE_PIPE_INODE_INFO_BASE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PIPE_INODE_INFO_BASE 0 +-_ACEOF ++ $as_echo "#define HAVE_PIPE_INODE_INFO_BASE 0" >>confdefs.h + + HAVE_PIPE_INODE_INFO_BASE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # OK if missing. + + + +- +- echo "$as_me:$LINENO: checking kernel for pipe_buf_operations.pin" >&5 +-echo $ECHO_N "checking kernel for pipe_buf_operations.pin... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for pipe_buf_operations.pin" >&5 ++$as_echo_n "checking kernel for pipe_buf_operations.pin... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -45931,42 +33580,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -45974,48 +33599,39 @@ + cr_result=$cr_cv_kconfig_HAVE_PIPE_BUF_OPERATIONS_PIN + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PIPE_BUF_OPERATIONS_PIN 1 +-_ACEOF ++ $as_echo "#define HAVE_PIPE_BUF_OPERATIONS_PIN 1" >>confdefs.h + + HAVE_PIPE_BUF_OPERATIONS_PIN=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PIPE_BUF_OPERATIONS_PIN 0 +-_ACEOF ++ $as_echo "#define HAVE_PIPE_BUF_OPERATIONS_PIN 0" >>confdefs.h + + HAVE_PIPE_BUF_OPERATIONS_PIN='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -z "${HAVE_PIPE_BUF_OPERATIONS_PIN}"; then + + +- +- echo "$as_me:$LINENO: checking kernel for 2-arg pipe_ops.unmap" >&5 +-echo $ECHO_N "checking kernel for 2-arg pipe_ops.unmap... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg pipe_ops.unmap" >&5 ++$as_echo_n "checking kernel for 2-arg pipe_ops.unmap... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -46038,42 +33654,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -46081,46 +33673,37 @@ + cr_result=$cr_cv_kconfig_HAVE_2_ARG_PIPE_OPS_UNMAP + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_ARG_PIPE_OPS_UNMAP 1 +-_ACEOF ++ $as_echo "#define HAVE_2_ARG_PIPE_OPS_UNMAP 1" >>confdefs.h + + HAVE_2_ARG_PIPE_OPS_UNMAP=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_ARG_PIPE_OPS_UNMAP 0 +-_ACEOF ++ $as_echo "#define HAVE_2_ARG_PIPE_OPS_UNMAP 0" >>confdefs.h + + HAVE_2_ARG_PIPE_OPS_UNMAP='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 3-arg pipe_ops.unmap" >&5 +-echo $ECHO_N "checking kernel for 3-arg pipe_ops.unmap... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 3-arg pipe_ops.unmap" >&5 ++$as_echo_n "checking kernel for 3-arg pipe_ops.unmap... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -46143,42 +33726,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -46186,22 +33745,18 @@ + cr_result=$cr_cv_kconfig_HAVE_3_ARG_PIPE_OPS_UNMAP + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_3_ARG_PIPE_OPS_UNMAP 1 +-_ACEOF ++ $as_echo "#define HAVE_3_ARG_PIPE_OPS_UNMAP 1" >>confdefs.h + + HAVE_3_ARG_PIPE_OPS_UNMAP=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_3_ARG_PIPE_OPS_UNMAP 0 +-_ACEOF ++ $as_echo "#define HAVE_3_ARG_PIPE_OPS_UNMAP 0" >>confdefs.h + + HAVE_3_ARG_PIPE_OPS_UNMAP='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + fi + # Require exactly one match +@@ -46225,39 +33780,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -46271,19 +33846,17 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unrecognized pipe buf operations" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unrecognized pipe buf operations" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for anon_pipe_buf_ops" >&5 +-echo $ECHO_N "checking kernel symbol table for anon_pipe_buf_ops... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_anon_pipe_buf_ops+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ as_fn_error "Unable to use kernel $LINUX_VER - unrecognized pipe buf operations" "$LINENO" 5 ++ ++fi ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for anon_pipe_buf_ops" >&5 ++$as_echo_n "checking kernel symbol table for anon_pipe_buf_ops... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_anon_pipe_buf_ops+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_anon_pipe_buf_ops=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}anon_pipe_buf_ops$/ {s/ .*//p;q;}"` +@@ -46299,11 +33872,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -46323,42 +33892,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_anon_pipe_buf_ops="Y$cr_cv_ksymtab_anon_pipe_buf_ops" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_anon_pipe_buf_ops="N$cr_cv_ksymtab_anon_pipe_buf_ops" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -46388,35 +33933,30 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # For O_DIRECT support + + + +- +- echo "$as_me:$LINENO: checking kernel for file_operations.check_flags" >&5 +-echo $ECHO_N "checking kernel for file_operations.check_flags... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for file_operations.check_flags" >&5 ++$as_echo_n "checking kernel for file_operations.check_flags... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -46434,42 +33974,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -46477,48 +33993,39 @@ + cr_result=$cr_cv_kconfig_HAVE_FILE_OPERATIONS_CHECK_FLAGS + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 1 +-_ACEOF ++ $as_echo "#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 1" >>confdefs.h + + HAVE_FILE_OPERATIONS_CHECK_FLAGS=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 0 +-_ACEOF ++ $as_echo "#define HAVE_FILE_OPERATIONS_CHECK_FLAGS 0" >>confdefs.h + + HAVE_FILE_OPERATIONS_CHECK_FLAGS='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for inode.i_mapping" >&5 +-echo $ECHO_N "checking kernel for inode.i_mapping... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_INODE_I_MAPPING+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for inode.i_mapping" >&5 ++$as_echo_n "checking kernel for inode.i_mapping... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_INODE_I_MAPPING+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -46536,42 +34043,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_INODE_I_MAPPING=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_INODE_I_MAPPING=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -46579,48 +34062,39 @@ + cr_result=$cr_cv_kconfig_HAVE_INODE_I_MAPPING + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_INODE_I_MAPPING 1 +-_ACEOF ++ $as_echo "#define HAVE_INODE_I_MAPPING 1" >>confdefs.h + + HAVE_INODE_I_MAPPING=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_INODE_I_MAPPING 0 +-_ACEOF ++ $as_echo "#define HAVE_INODE_I_MAPPING 0" >>confdefs.h + + HAVE_INODE_I_MAPPING='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for file.f_mapping" >&5 +-echo $ECHO_N "checking kernel for file.f_mapping... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_FILE_F_MAPPING+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for file.f_mapping" >&5 ++$as_echo_n "checking kernel for file.f_mapping... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_FILE_F_MAPPING+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -46638,42 +34112,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FILE_F_MAPPING=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_FILE_F_MAPPING=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -46681,22 +34131,18 @@ + cr_result=$cr_cv_kconfig_HAVE_FILE_F_MAPPING + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FILE_F_MAPPING 1 +-_ACEOF ++ $as_echo "#define HAVE_FILE_F_MAPPING 1" >>confdefs.h + + HAVE_FILE_F_MAPPING=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_FILE_F_MAPPING 0 +-_ACEOF ++ $as_echo "#define HAVE_FILE_F_MAPPING 0" >>confdefs.h + + HAVE_FILE_F_MAPPING='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # Require one or more match on mapping +@@ -46720,39 +34166,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -46766,39 +34232,32 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - could not locate address_space in inode or file structs" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - could not locate address_space in inode or file structs" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 4-arg do_generic_file_read" >&5 +-echo $ECHO_N "checking kernel for 4-arg do_generic_file_read... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - could not locate address_space in inode or file structs" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 4-arg do_generic_file_read" >&5 ++$as_echo_n "checking kernel for 4-arg do_generic_file_read... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -46819,42 +34278,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -46862,52 +34297,43 @@ + cr_result=$cr_cv_kconfig_HAVE_4_ARG_DO_GENERIC_FILE_READ + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_4_ARG_DO_GENERIC_FILE_READ 1 +-_ACEOF ++ $as_echo "#define HAVE_4_ARG_DO_GENERIC_FILE_READ 1" >>confdefs.h + + HAVE_4_ARG_DO_GENERIC_FILE_READ=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_4_ARG_DO_GENERIC_FILE_READ 0 +-_ACEOF ++ $as_echo "#define HAVE_4_ARG_DO_GENERIC_FILE_READ 0" >>confdefs.h + + HAVE_4_ARG_DO_GENERIC_FILE_READ='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 5-arg do_generic_file_read" >&5 +-echo $ECHO_N "checking kernel for 5-arg do_generic_file_read... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 5-arg do_generic_file_read" >&5 ++$as_echo_n "checking kernel for 5-arg do_generic_file_read... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -46928,42 +34354,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -46971,50 +34373,41 @@ + cr_result=$cr_cv_kconfig_HAVE_5_ARG_DO_GENERIC_FILE_READ + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_5_ARG_DO_GENERIC_FILE_READ 1 +-_ACEOF ++ $as_echo "#define HAVE_5_ARG_DO_GENERIC_FILE_READ 1" >>confdefs.h + + HAVE_5_ARG_DO_GENERIC_FILE_READ=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_5_ARG_DO_GENERIC_FILE_READ 0 +-_ACEOF ++ $as_echo "#define HAVE_5_ARG_DO_GENERIC_FILE_READ 0" >>confdefs.h + + HAVE_5_ARG_DO_GENERIC_FILE_READ='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for read_descriptor_t.arg.data" >&5 +-echo $ECHO_N "checking kernel for read_descriptor_t.arg.data... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for read_descriptor_t.arg.data" >&5 ++$as_echo_n "checking kernel for read_descriptor_t.arg.data... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -47032,42 +34425,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -47075,48 +34444,39 @@ + cr_result=$cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_ARG_DATA + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 1 +-_ACEOF ++ $as_echo "#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 1" >>confdefs.h + + HAVE_READ_DESCRIPTOR_T_ARG_DATA=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 0 +-_ACEOF ++ $as_echo "#define HAVE_READ_DESCRIPTOR_T_ARG_DATA 0" >>confdefs.h + + HAVE_READ_DESCRIPTOR_T_ARG_DATA='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for read_descriptor_t.buf" >&5 +-echo $ECHO_N "checking kernel for read_descriptor_t.buf... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for read_descriptor_t.buf" >&5 ++$as_echo_n "checking kernel for read_descriptor_t.buf... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -47134,42 +34494,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -47177,22 +34513,18 @@ + cr_result=$cr_cv_kconfig_HAVE_READ_DESCRIPTOR_T_BUF + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_READ_DESCRIPTOR_T_BUF 1 +-_ACEOF ++ $as_echo "#define HAVE_READ_DESCRIPTOR_T_BUF 1" >>confdefs.h + + HAVE_READ_DESCRIPTOR_T_BUF=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_READ_DESCRIPTOR_T_BUF 0 +-_ACEOF ++ $as_echo "#define HAVE_READ_DESCRIPTOR_T_BUF 0" >>confdefs.h + + HAVE_READ_DESCRIPTOR_T_BUF='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test "${HAVE_READ_DESCRIPTOR_T_ARG_DATA}${HAVE_READ_DESCRIPTOR_T_BUF}" != "1"; then +@@ -47215,39 +34547,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -47261,36 +34613,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to use do_generic_file_read()" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to use do_generic_file_read()" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for splice_direct_to_actor" >&5 +-echo $ECHO_N "checking kernel for splice_direct_to_actor... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine how to use do_generic_file_read()" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for splice_direct_to_actor" >&5 ++$as_echo_n "checking kernel for splice_direct_to_actor... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -47316,42 +34661,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -47359,52 +34680,43 @@ + cr_result=$cr_cv_kconfig_HAVE_SPLICE_DIRECT_TO_ACTOR + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SPLICE_DIRECT_TO_ACTOR 1 +-_ACEOF ++ $as_echo "#define HAVE_SPLICE_DIRECT_TO_ACTOR 1" >>confdefs.h + + HAVE_SPLICE_DIRECT_TO_ACTOR=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SPLICE_DIRECT_TO_ACTOR 0 +-_ACEOF ++ $as_echo "#define HAVE_SPLICE_DIRECT_TO_ACTOR 0" >>confdefs.h + + HAVE_SPLICE_DIRECT_TO_ACTOR='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 4-arg vfs_mknod" >&5 +-echo $ECHO_N "checking kernel for 4-arg vfs_mknod... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 4-arg vfs_mknod" >&5 ++$as_echo_n "checking kernel for 4-arg vfs_mknod... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -47425,42 +34737,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -47468,52 +34756,43 @@ + cr_result=$cr_cv_kconfig_HAVE_4_ARG_VFS_MKNOD + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_4_ARG_VFS_MKNOD 1 +-_ACEOF ++ $as_echo "#define HAVE_4_ARG_VFS_MKNOD 1" >>confdefs.h + + HAVE_4_ARG_VFS_MKNOD=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_4_ARG_VFS_MKNOD 0 +-_ACEOF ++ $as_echo "#define HAVE_4_ARG_VFS_MKNOD 0" >>confdefs.h + + HAVE_4_ARG_VFS_MKNOD='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 5-arg vfs_mknod" >&5 +-echo $ECHO_N "checking kernel for 5-arg vfs_mknod... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 5-arg vfs_mknod" >&5 ++$as_echo_n "checking kernel for 5-arg vfs_mknod... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -47534,42 +34813,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -47577,22 +34832,18 @@ + cr_result=$cr_cv_kconfig_HAVE_5_ARG_VFS_MKNOD + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_5_ARG_VFS_MKNOD 1 +-_ACEOF ++ $as_echo "#define HAVE_5_ARG_VFS_MKNOD 1" >>confdefs.h + + HAVE_5_ARG_VFS_MKNOD=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_5_ARG_VFS_MKNOD 0 +-_ACEOF ++ $as_echo "#define HAVE_5_ARG_VFS_MKNOD 0" >>confdefs.h + + HAVE_5_ARG_VFS_MKNOD='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + +@@ -47617,39 +34868,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -47663,39 +34934,32 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_mknod()" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_mknod()" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 2-arg vfs_unlink" >&5 +-echo $ECHO_N "checking kernel for 2-arg vfs_unlink... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine how to call vfs_mknod()" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg vfs_unlink" >&5 ++$as_echo_n "checking kernel for 2-arg vfs_unlink... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -47716,42 +34980,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -47759,52 +34999,43 @@ + cr_result=$cr_cv_kconfig_HAVE_2_ARG_VFS_UNLINK + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_ARG_VFS_UNLINK 1 +-_ACEOF ++ $as_echo "#define HAVE_2_ARG_VFS_UNLINK 1" >>confdefs.h + + HAVE_2_ARG_VFS_UNLINK=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_ARG_VFS_UNLINK 0 +-_ACEOF ++ $as_echo "#define HAVE_2_ARG_VFS_UNLINK 0" >>confdefs.h + + HAVE_2_ARG_VFS_UNLINK='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 3-arg vfs_unlink" >&5 +-echo $ECHO_N "checking kernel for 3-arg vfs_unlink... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 3-arg vfs_unlink" >&5 ++$as_echo_n "checking kernel for 3-arg vfs_unlink... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -47825,42 +35056,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -47868,22 +35075,18 @@ + cr_result=$cr_cv_kconfig_HAVE_3_ARG_VFS_UNLINK + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_3_ARG_VFS_UNLINK 1 +-_ACEOF ++ $as_echo "#define HAVE_3_ARG_VFS_UNLINK 1" >>confdefs.h + + HAVE_3_ARG_VFS_UNLINK=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_3_ARG_VFS_UNLINK 0 +-_ACEOF ++ $as_echo "#define HAVE_3_ARG_VFS_UNLINK 0" >>confdefs.h + + HAVE_3_ARG_VFS_UNLINK='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + +@@ -47908,39 +35111,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -47954,39 +35177,32 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_unlink()" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call vfs_unlink()" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 2-arg notify_change" >&5 +-echo $ECHO_N "checking kernel for 2-arg notify_change... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine how to call vfs_unlink()" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 2-arg notify_change" >&5 ++$as_echo_n "checking kernel for 2-arg notify_change... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -48007,42 +35223,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -48050,52 +35242,43 @@ + cr_result=$cr_cv_kconfig_HAVE_2_ARG_NOTIFY_CHANGE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_ARG_NOTIFY_CHANGE 1 +-_ACEOF ++ $as_echo "#define HAVE_2_ARG_NOTIFY_CHANGE 1" >>confdefs.h + + HAVE_2_ARG_NOTIFY_CHANGE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_2_ARG_NOTIFY_CHANGE 0 +-_ACEOF ++ $as_echo "#define HAVE_2_ARG_NOTIFY_CHANGE 0" >>confdefs.h + + HAVE_2_ARG_NOTIFY_CHANGE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for 3-arg notify_change" >&5 +-echo $ECHO_N "checking kernel for 3-arg notify_change... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for 3-arg notify_change" >&5 ++$as_echo_n "checking kernel for 3-arg notify_change... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -48116,42 +35299,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -48159,22 +35318,18 @@ + cr_result=$cr_cv_kconfig_HAVE_3_ARG_NOTIFY_CHANGE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_3_ARG_NOTIFY_CHANGE 1 +-_ACEOF ++ $as_echo "#define HAVE_3_ARG_NOTIFY_CHANGE 1" >>confdefs.h + + HAVE_3_ARG_NOTIFY_CHANGE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_3_ARG_NOTIFY_CHANGE 0 +-_ACEOF ++ $as_echo "#define HAVE_3_ARG_NOTIFY_CHANGE 0" >>confdefs.h + + HAVE_3_ARG_NOTIFY_CHANGE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + +@@ -48199,39 +35354,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -48245,36 +35420,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to call notify_change()" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to call notify_change()" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for task.ptrace" >&5 +-echo $ECHO_N "checking kernel for task.ptrace... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_TASK_PTRACE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine how to call notify_change()" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.ptrace" >&5 ++$as_echo_n "checking kernel for task.ptrace... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_TASK_PTRACE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -48292,42 +35460,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_PTRACE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_PTRACE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -48335,48 +35479,39 @@ + cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_PTRACE 1 +-_ACEOF ++ $as_echo "#define HAVE_TASK_PTRACE 1" >>confdefs.h + + HAVE_TASK_PTRACE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_PTRACE 0 +-_ACEOF ++ $as_echo "#define HAVE_TASK_PTRACE 0" >>confdefs.h + + HAVE_TASK_PTRACE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for task.ptracees" >&5 +-echo $ECHO_N "checking kernel for task.ptracees... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_TASK_PTRACEES+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.ptracees" >&5 ++$as_echo_n "checking kernel for task.ptracees... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_TASK_PTRACEES+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -48394,42 +35529,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_PTRACEES=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_PTRACEES=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -48437,48 +35548,39 @@ + cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACEES + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_PTRACEES 1 +-_ACEOF ++ $as_echo "#define HAVE_TASK_PTRACEES 1" >>confdefs.h + + HAVE_TASK_PTRACEES=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_PTRACEES 0 +-_ACEOF ++ $as_echo "#define HAVE_TASK_PTRACEES 0" >>confdefs.h + + HAVE_TASK_PTRACEES='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for task.ptraced" >&5 +-echo $ECHO_N "checking kernel for task.ptraced... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_TASK_PTRACED+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for task.ptraced" >&5 ++$as_echo_n "checking kernel for task.ptraced... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_TASK_PTRACED+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -48496,42 +35598,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_PTRACED=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_TASK_PTRACED=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -48539,33 +35617,29 @@ + cr_result=$cr_cv_kconfig_HAVE_TASK_PTRACED + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_PTRACED 1 +-_ACEOF ++ $as_echo "#define HAVE_TASK_PTRACED 1" >>confdefs.h + + HAVE_TASK_PTRACED=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_TASK_PTRACED 0 +-_ACEOF ++ $as_echo "#define HAVE_TASK_PTRACED 0" >>confdefs.h + + HAVE_TASK_PTRACED='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -n "${HAVE_TASK_PTRACEES}"; then + + +- echo "$as_me:$LINENO: checking kernel symbol table for ptrace_utrace_ops" >&5 +-echo $ECHO_N "checking kernel symbol table for ptrace_utrace_ops... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_ptrace_utrace_ops+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for ptrace_utrace_ops" >&5 ++$as_echo_n "checking kernel symbol table for ptrace_utrace_ops... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_ptrace_utrace_ops+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_ptrace_utrace_ops=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}ptrace_utrace_ops$/ {s/ .*//p;q;}"` +@@ -48581,11 +35655,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -48605,42 +35675,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_ptrace_utrace_ops="Y$cr_cv_ksymtab_ptrace_utrace_ops" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_ptrace_utrace_ops="N$cr_cv_ksymtab_ptrace_utrace_ops" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -48670,13 +35716,11 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + if test -z "$cr_addr"; then +- { { echo "$as_me:$LINENO: error: failed to find symbol ptrace_utrace_ops" >&5 +-echo "$as_me: error: failed to find symbol ptrace_utrace_ops" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "failed to find symbol ptrace_utrace_ops" "$LINENO" 5 + fi + fi + if test "${HAVE_TASK_PTRACE}${HAVE_TASK_PTRACEES}" != "1"; then +@@ -48699,39 +35743,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -48745,36 +35809,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to identify ptrace()ed/ing processes" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to identify ptrace()ed/ing processes" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for proc_root" >&5 +-echo $ECHO_N "checking kernel for proc_root... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PROC_ROOT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine how to identify ptrace()ed/ing processes" "$LINENO" 5 ++ ++fi ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for proc_root" >&5 ++$as_echo_n "checking kernel for proc_root... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PROC_ROOT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -48793,42 +35850,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PROC_ROOT=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PROC_ROOT=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -48836,31 +35869,27 @@ + cr_result=$cr_cv_kconfig_HAVE_PROC_ROOT + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PROC_ROOT 1 +-_ACEOF ++ $as_echo "#define HAVE_PROC_ROOT 1" >>confdefs.h + + HAVE_PROC_ROOT=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PROC_ROOT 0 +-_ACEOF ++ $as_echo "#define HAVE_PROC_ROOT 0" >>confdefs.h + + HAVE_PROC_ROOT='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + + # check kmalloc max size + +- echo "$as_me:$LINENO: checking kernel for maximum kmalloc() allocation" >&5 +-echo $ECHO_N "checking kernel for maximum kmalloc() allocation... $ECHO_C" >&6 +-if test "${cr_cv_kconfig_kmalloc_max+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for maximum kmalloc() allocation" >&5 ++$as_echo_n "checking kernel for maximum kmalloc() allocation... " >&6; } ++if test "${cr_cv_kconfig_kmalloc_max+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_kmalloc_default="131072 (default)" +@@ -48877,8 +35906,8 @@ + fi + + fi +-echo "$as_me:$LINENO: result: $cr_cv_kconfig_kmalloc_max" >&5 +-echo "${ECHO_T}$cr_cv_kconfig_kmalloc_max" >&6 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_cv_kconfig_kmalloc_max" >&5 ++$as_echo "$cr_cv_kconfig_kmalloc_max" >&6; } + cr_kmalloc_max=`echo $cr_cv_kconfig_kmalloc_max | cut -d' ' -f1` + + cat >>confdefs.h <<_ACEOF +@@ -48892,12 +35921,12 @@ + # DATA + + +- echo "$as_me:$LINENO: checking kernel symbol table for tasklist_lock" >&5 +-echo $ECHO_N "checking kernel symbol table for tasklist_lock... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_tasklist_lock+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for tasklist_lock" >&5 ++$as_echo_n "checking kernel symbol table for tasklist_lock... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_tasklist_lock+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_tasklist_lock=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}tasklist_lock$/ {s/ .*//p;q;}"` +@@ -48913,11 +35942,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -48937,42 +35962,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_tasklist_lock="Y$cr_cv_ksymtab_tasklist_lock" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_tasklist_lock="N$cr_cv_ksymtab_tasklist_lock" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -48983,9 +35984,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_tasklist_lock" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol tasklist_lock but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol tasklist_lock but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol tasklist_lock but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_tasklist_lock | tr -d 'YN'` + if test $cr_result = 0; then +@@ -49001,17 +36000,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for shmem_file_operations" >&5 +-echo $ECHO_N "checking kernel symbol table for shmem_file_operations... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_shmem_file_operations+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for shmem_file_operations" >&5 ++$as_echo_n "checking kernel symbol table for shmem_file_operations... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_shmem_file_operations+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_shmem_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}shmem_file_operations$/ {s/ .*//p;q;}"` +@@ -49027,11 +36026,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -49051,42 +36046,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_shmem_file_operations="Y$cr_cv_ksymtab_shmem_file_operations" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_shmem_file_operations="N$cr_cv_ksymtab_shmem_file_operations" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -49116,17 +36087,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for ramfs_file_operations" >&5 +-echo $ECHO_N "checking kernel symbol table for ramfs_file_operations... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_ramfs_file_operations+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for ramfs_file_operations" >&5 ++$as_echo_n "checking kernel symbol table for ramfs_file_operations... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_ramfs_file_operations+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_ramfs_file_operations=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}ramfs_file_operations$/ {s/ .*//p;q;}"` +@@ -49142,11 +36113,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -49166,42 +36133,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_ramfs_file_operations="Y$cr_cv_ksymtab_ramfs_file_operations" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_ramfs_file_operations="N$cr_cv_ksymtab_ramfs_file_operations" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -49231,17 +36174,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for HPAGE_SHIFT" >&5 +-echo $ECHO_N "checking kernel symbol table for HPAGE_SHIFT... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_HPAGE_SHIFT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for HPAGE_SHIFT" >&5 ++$as_echo_n "checking kernel symbol table for HPAGE_SHIFT... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_HPAGE_SHIFT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_HPAGE_SHIFT=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}HPAGE_SHIFT$/ {s/ .*//p;q;}"` +@@ -49257,11 +36200,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -49281,42 +36220,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_HPAGE_SHIFT="Y$cr_cv_ksymtab_HPAGE_SHIFT" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_HPAGE_SHIFT="N$cr_cv_ksymtab_HPAGE_SHIFT" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -49346,17 +36261,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for phys_base" >&5 +-echo $ECHO_N "checking kernel symbol table for phys_base... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_phys_base+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for phys_base" >&5 ++$as_echo_n "checking kernel symbol table for phys_base... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_phys_base+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_phys_base=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}phys_base$/ {s/ .*//p;q;}"` +@@ -49372,11 +36287,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -49396,42 +36307,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_phys_base="Y$cr_cv_ksymtab_phys_base" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_phys_base="N$cr_cv_ksymtab_phys_base" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -49461,19 +36348,19 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + # CODE + + +- echo "$as_me:$LINENO: checking kernel symbol table for do_pipe" >&5 +-echo $ECHO_N "checking kernel symbol table for do_pipe... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_do_pipe+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for do_pipe" >&5 ++$as_echo_n "checking kernel symbol table for do_pipe... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_do_pipe+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_do_pipe=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_pipe$/ {s/ .*//p;q;}"` +@@ -49489,11 +36376,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -49513,42 +36396,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_do_pipe="Y$cr_cv_ksymtab_do_pipe" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_do_pipe="N$cr_cv_ksymtab_do_pipe" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -49559,9 +36418,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_do_pipe" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol do_pipe but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol do_pipe but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol do_pipe but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_do_pipe | tr -d 'YN'` + if test $cr_result = 0; then +@@ -49577,17 +36434,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for do_pipe_flags" >&5 +-echo $ECHO_N "checking kernel symbol table for do_pipe_flags... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_do_pipe_flags+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for do_pipe_flags" >&5 ++$as_echo_n "checking kernel symbol table for do_pipe_flags... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_do_pipe_flags+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_do_pipe_flags=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_pipe_flags$/ {s/ .*//p;q;}"` +@@ -49603,11 +36460,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -49627,42 +36480,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_do_pipe_flags="Y$cr_cv_ksymtab_do_pipe_flags" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_do_pipe_flags="N$cr_cv_ksymtab_do_pipe_flags" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -49673,9 +36502,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_do_pipe_flags" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol do_pipe_flags but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol do_pipe_flags but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol do_pipe_flags but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_do_pipe_flags | tr -d 'YN'` + if test $cr_result = 0; then +@@ -49691,17 +36518,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for sys_munmap" >&5 +-echo $ECHO_N "checking kernel symbol table for sys_munmap... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_sys_munmap+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_munmap" >&5 ++$as_echo_n "checking kernel symbol table for sys_munmap... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_sys_munmap+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_sys_munmap=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_munmap$/ {s/ .*//p;q;}"` +@@ -49717,11 +36544,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -49741,42 +36564,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_munmap="Y$cr_cv_ksymtab_sys_munmap" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_munmap="N$cr_cv_ksymtab_sys_munmap" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -49806,17 +36605,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for sys_dup2" >&5 +-echo $ECHO_N "checking kernel symbol table for sys_dup2... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_sys_dup2+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_dup2" >&5 ++$as_echo_n "checking kernel symbol table for sys_dup2... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_sys_dup2+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_sys_dup2=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_dup2$/ {s/ .*//p;q;}"` +@@ -49832,11 +36631,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -49856,42 +36651,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_dup2="Y$cr_cv_ksymtab_sys_dup2" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_dup2="N$cr_cv_ksymtab_sys_dup2" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -49921,17 +36692,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for sys_lseek" >&5 +-echo $ECHO_N "checking kernel symbol table for sys_lseek... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_sys_lseek+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_lseek" >&5 ++$as_echo_n "checking kernel symbol table for sys_lseek... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_sys_lseek+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_sys_lseek=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_lseek$/ {s/ .*//p;q;}"` +@@ -49947,11 +36718,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -49971,42 +36738,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_lseek="Y$cr_cv_ksymtab_sys_lseek" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_lseek="N$cr_cv_ksymtab_sys_lseek" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -50036,17 +36779,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for sys_ftruncate" >&5 +-echo $ECHO_N "checking kernel symbol table for sys_ftruncate... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_sys_ftruncate+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_ftruncate" >&5 ++$as_echo_n "checking kernel symbol table for sys_ftruncate... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_sys_ftruncate+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_sys_ftruncate=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_ftruncate$/ {s/ .*//p;q;}"` +@@ -50062,11 +36805,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -50086,42 +36825,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_ftruncate="Y$cr_cv_ksymtab_sys_ftruncate" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_ftruncate="N$cr_cv_ksymtab_sys_ftruncate" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -50151,17 +36866,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for sys_mprotect" >&5 +-echo $ECHO_N "checking kernel symbol table for sys_mprotect... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_sys_mprotect+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_mprotect" >&5 ++$as_echo_n "checking kernel symbol table for sys_mprotect... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_sys_mprotect+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_sys_mprotect=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_mprotect$/ {s/ .*//p;q;}"` +@@ -50177,11 +36892,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -50201,42 +36912,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_mprotect="Y$cr_cv_ksymtab_sys_mprotect" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_mprotect="N$cr_cv_ksymtab_sys_mprotect" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -50266,17 +36953,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for sys_setitimer" >&5 +-echo $ECHO_N "checking kernel symbol table for sys_setitimer... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_sys_setitimer+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_setitimer" >&5 ++$as_echo_n "checking kernel symbol table for sys_setitimer... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_sys_setitimer+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_sys_setitimer=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setitimer$/ {s/ .*//p;q;}"` +@@ -50292,11 +36979,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -50316,42 +36999,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_setitimer="Y$cr_cv_ksymtab_sys_setitimer" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_setitimer="N$cr_cv_ksymtab_sys_setitimer" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -50381,17 +37040,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for sys_prctl" >&5 +-echo $ECHO_N "checking kernel symbol table for sys_prctl... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_sys_prctl+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_prctl" >&5 ++$as_echo_n "checking kernel symbol table for sys_prctl... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_sys_prctl+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_sys_prctl=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_prctl$/ {s/ .*//p;q;}"` +@@ -50407,11 +37066,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -50431,42 +37086,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_prctl="Y$cr_cv_ksymtab_sys_prctl" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_prctl="N$cr_cv_ksymtab_sys_prctl" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -50496,18 +37127,18 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for copy_fs_struct" >&5 +-echo $ECHO_N "checking kernel symbol table for copy_fs_struct... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_copy_fs_struct+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for copy_fs_struct" >&5 ++$as_echo_n "checking kernel symbol table for copy_fs_struct... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_copy_fs_struct+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_copy_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}copy_fs_struct$/ {s/ .*//p;q;}"` +@@ -50523,11 +37154,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -50547,42 +37174,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_copy_fs_struct="Y$cr_cv_ksymtab_copy_fs_struct" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_copy_fs_struct="N$cr_cv_ksymtab_copy_fs_struct" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -50593,9 +37196,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_copy_fs_struct" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol copy_fs_struct but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol copy_fs_struct but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol copy_fs_struct but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_copy_fs_struct | tr -d 'YN'` + if test $cr_result = 0; then +@@ -50611,17 +37212,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for put_fs_struct" >&5 +-echo $ECHO_N "checking kernel symbol table for put_fs_struct... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_put_fs_struct+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for put_fs_struct" >&5 ++$as_echo_n "checking kernel symbol table for put_fs_struct... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_put_fs_struct+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_put_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}put_fs_struct$/ {s/ .*//p;q;}"` +@@ -50637,11 +37238,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -50661,42 +37258,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_put_fs_struct="Y$cr_cv_ksymtab_put_fs_struct" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_put_fs_struct="N$cr_cv_ksymtab_put_fs_struct" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -50707,9 +37280,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_put_fs_struct" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol put_fs_struct but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol put_fs_struct but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol put_fs_struct but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_put_fs_struct | tr -d 'YN'` + if test $cr_result = 0; then +@@ -50725,18 +37296,18 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + if test -z "$cr_addr"; then + + +- echo "$as_me:$LINENO: checking kernel symbol table for free_fs_struct" >&5 +-echo $ECHO_N "checking kernel symbol table for free_fs_struct... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_free_fs_struct+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for free_fs_struct" >&5 ++$as_echo_n "checking kernel symbol table for free_fs_struct... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_free_fs_struct+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_free_fs_struct=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}free_fs_struct$/ {s/ .*//p;q;}"` +@@ -50752,11 +37323,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -50776,42 +37343,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_free_fs_struct="Y$cr_cv_ksymtab_free_fs_struct" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_free_fs_struct="N$cr_cv_ksymtab_free_fs_struct" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -50822,9 +37365,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_free_fs_struct" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol free_fs_struct but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol free_fs_struct but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol free_fs_struct but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_free_fs_struct | tr -d 'YN'` + if test $cr_result = 0; then +@@ -50840,25 +37381,23 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + if test -z "$cr_addr"; then +- { { echo "$as_me:$LINENO: error: failed to find either symbol put_fs_struct or free_fs_struct" >&5 +-echo "$as_me: error: failed to find either symbol put_fs_struct or free_fs_struct" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "failed to find either symbol put_fs_struct or free_fs_struct" "$LINENO" 5 + fi + fi + + # For blcr + + +- echo "$as_me:$LINENO: checking kernel symbol table for set_fs_pwd" >&5 +-echo $ECHO_N "checking kernel symbol table for set_fs_pwd... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_set_fs_pwd+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for set_fs_pwd" >&5 ++$as_echo_n "checking kernel symbol table for set_fs_pwd... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_set_fs_pwd+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_set_fs_pwd=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}set_fs_pwd$/ {s/ .*//p;q;}"` +@@ -50874,11 +37413,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -50898,42 +37433,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_set_fs_pwd="Y$cr_cv_ksymtab_set_fs_pwd" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_set_fs_pwd="N$cr_cv_ksymtab_set_fs_pwd" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -50944,9 +37455,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_set_fs_pwd" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol set_fs_pwd but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol set_fs_pwd but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol set_fs_pwd but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_set_fs_pwd | tr -d 'YN'` + if test $cr_result = 0; then +@@ -50962,18 +37471,18 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + # For vmadump4 + + +- echo "$as_me:$LINENO: checking kernel symbol table for sys_mremap" >&5 +-echo $ECHO_N "checking kernel symbol table for sys_mremap... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_sys_mremap+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_mremap" >&5 ++$as_echo_n "checking kernel symbol table for sys_mremap... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_sys_mremap+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_sys_mremap=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_mremap$/ {s/ .*//p;q;}"` +@@ -50989,11 +37498,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -51013,42 +37518,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_mremap="Y$cr_cv_ksymtab_sys_mremap" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_mremap="N$cr_cv_ksymtab_sys_mremap" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -51078,17 +37559,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for do_sigaction" >&5 +-echo $ECHO_N "checking kernel symbol table for do_sigaction... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_do_sigaction+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for do_sigaction" >&5 ++$as_echo_n "checking kernel symbol table for do_sigaction... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_do_sigaction+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_do_sigaction=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}do_sigaction$/ {s/ .*//p;q;}"` +@@ -51104,11 +37585,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -51128,42 +37605,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_do_sigaction="Y$cr_cv_ksymtab_do_sigaction" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_do_sigaction="N$cr_cv_ksymtab_do_sigaction" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -51174,9 +37627,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_do_sigaction" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol do_sigaction but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol do_sigaction but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol do_sigaction but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_do_sigaction | tr -d 'YN'` + if test $cr_result = 0; then +@@ -51192,18 +37643,18 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +-if test $CR_ARCH = x86_64; then +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for load_gs_index" >&5 +-echo $ECHO_N "checking kernel symbol table for load_gs_index... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_load_gs_index+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++if test $CR_KARCH = x86_64; then ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for load_gs_index" >&5 ++$as_echo_n "checking kernel symbol table for load_gs_index... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_load_gs_index+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_load_gs_index=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}load_gs_index$/ {s/ .*//p;q;}"` +@@ -51219,11 +37670,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -51243,42 +37690,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_load_gs_index="Y$cr_cv_ksymtab_load_gs_index" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_load_gs_index="N$cr_cv_ksymtab_load_gs_index" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -51289,9 +37712,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab_load_gs_index" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol load_gs_index but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol load_gs_index but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol load_gs_index but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab_load_gs_index | tr -d 'YN'` + if test $cr_result = 0; then +@@ -51307,34 +37728,29 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for read_pda" >&5 +-echo $ECHO_N "checking kernel for read_pda... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_READ_PDA+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for read_pda" >&5 ++$as_echo_n "checking kernel for read_pda... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_READ_PDA+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -51358,42 +37774,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_READ_PDA=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_READ_PDA=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -51401,48 +37793,39 @@ + cr_result=$cr_cv_kconfig_HAVE_READ_PDA + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_READ_PDA 1 +-_ACEOF ++ $as_echo "#define HAVE_READ_PDA 1" >>confdefs.h + + HAVE_READ_PDA=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_READ_PDA 0 +-_ACEOF ++ $as_echo "#define HAVE_READ_PDA 0" >>confdefs.h + + HAVE_READ_PDA='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for write_pda" >&5 +-echo $ECHO_N "checking kernel for write_pda... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_WRITE_PDA+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for write_pda" >&5 ++$as_echo_n "checking kernel for write_pda... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_WRITE_PDA+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -51466,42 +37849,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_WRITE_PDA=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_WRITE_PDA=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -51509,49 +37868,40 @@ + cr_result=$cr_cv_kconfig_HAVE_WRITE_PDA + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_WRITE_PDA 1 +-_ACEOF ++ $as_echo "#define HAVE_WRITE_PDA 1" >>confdefs.h + + HAVE_WRITE_PDA=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_WRITE_PDA 0 +-_ACEOF ++ $as_echo "#define HAVE_WRITE_PDA 0" >>confdefs.h + + HAVE_WRITE_PDA='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test "$HAVE_READ_PDA$HAVE_WRITE_PDA" != "11"; then + + + +- +- echo "$as_me:$LINENO: checking kernel for percpu_read" >&5 +-echo $ECHO_N "checking kernel for percpu_read... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PERCPU_READ+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for percpu_read" >&5 ++$as_echo_n "checking kernel for percpu_read... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PERCPU_READ+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -51575,42 +37925,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PERCPU_READ=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PERCPU_READ=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -51618,48 +37944,39 @@ + cr_result=$cr_cv_kconfig_HAVE_PERCPU_READ + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PERCPU_READ 1 +-_ACEOF ++ $as_echo "#define HAVE_PERCPU_READ 1" >>confdefs.h + + HAVE_PERCPU_READ=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PERCPU_READ 0 +-_ACEOF ++ $as_echo "#define HAVE_PERCPU_READ 0" >>confdefs.h + + HAVE_PERCPU_READ='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for percpu_write" >&5 +-echo $ECHO_N "checking kernel for percpu_write... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_PERCPU_WRITE+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for percpu_write" >&5 ++$as_echo_n "checking kernel for percpu_write... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_PERCPU_WRITE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -51683,42 +38000,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PERCPU_WRITE=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_PERCPU_WRITE=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -51726,22 +38019,18 @@ + cr_result=$cr_cv_kconfig_HAVE_PERCPU_WRITE + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PERCPU_WRITE 1 +-_ACEOF ++ $as_echo "#define HAVE_PERCPU_WRITE 1" >>confdefs.h + + HAVE_PERCPU_WRITE=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_PERCPU_WRITE 0 +-_ACEOF ++ $as_echo "#define HAVE_PERCPU_WRITE 0" >>confdefs.h + + HAVE_PERCPU_WRITE='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test "$HAVE_PERCPU_READ$HAVE_PERCPU_WRITE" != "11"; then +@@ -51764,39 +38053,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -51810,19 +38119,17 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - found neither {read,write}_pda() nor percpu_{read,write}()" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - found neither {read,write}_pda() nor percpu_{read,write}()" >&2;} +- { (exit 1); exit 1; }; } +- +- else +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for per_cpu__old_rsp" >&5 +-echo $ECHO_N "checking kernel symbol table for per_cpu__old_rsp... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_per_cpu__old_rsp+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ as_fn_error "Unable to use kernel $LINUX_VER - found neither {read,write}_pda() nor percpu_{read,write}()" "$LINENO" 5 ++ ++ else ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for per_cpu__old_rsp" >&5 ++$as_echo_n "checking kernel symbol table for per_cpu__old_rsp... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_per_cpu__old_rsp+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_per_cpu__old_rsp=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_DATA}per_cpu__old_rsp$/ {s/ .*//p;q;}"` +@@ -51838,11 +38145,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -51862,42 +38165,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_per_cpu__old_rsp="Y$cr_cv_ksymtab_per_cpu__old_rsp" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_per_cpu__old_rsp="N$cr_cv_ksymtab_per_cpu__old_rsp" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -51927,13 +38206,11 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + if test -z "$cr_addr"; then +- { { echo "$as_me:$LINENO: error: failed to locate symbol per_cpu__old_rsp" >&5 +-echo "$as_me: error: failed to locate symbol per_cpu__old_rsp" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "failed to locate symbol per_cpu__old_rsp" "$LINENO" 5 + fi + fi + fi +@@ -51941,12 +38218,12 @@ + if test x$enable_restore_ids = xyes; then + + +- echo "$as_me:$LINENO: checking kernel symbol table for sys_setgroups" >&5 +-echo $ECHO_N "checking kernel symbol table for sys_setgroups... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_sys_setgroups+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_setgroups" >&5 ++$as_echo_n "checking kernel symbol table for sys_setgroups... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_sys_setgroups+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_sys_setgroups=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setgroups$/ {s/ .*//p;q;}"` +@@ -51962,11 +38239,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -51986,42 +38259,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_setgroups="Y$cr_cv_ksymtab_sys_setgroups" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_setgroups="N$cr_cv_ksymtab_sys_setgroups" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -52051,17 +38300,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for sys_setresuid" >&5 +-echo $ECHO_N "checking kernel symbol table for sys_setresuid... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_sys_setresuid+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_setresuid" >&5 ++$as_echo_n "checking kernel symbol table for sys_setresuid... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_sys_setresuid+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_sys_setresuid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setresuid$/ {s/ .*//p;q;}"` +@@ -52077,11 +38326,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -52101,42 +38346,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_setresuid="Y$cr_cv_ksymtab_sys_setresuid" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_setresuid="N$cr_cv_ksymtab_sys_setresuid" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -52166,17 +38387,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for sys_setresgid" >&5 +-echo $ECHO_N "checking kernel symbol table for sys_setresgid... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_sys_setresgid+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_setresgid" >&5 ++$as_echo_n "checking kernel symbol table for sys_setresgid... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_sys_setresgid+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_sys_setresgid=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_setresgid$/ {s/ .*//p;q;}"` +@@ -52192,11 +38413,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -52216,42 +38433,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_setresgid="Y$cr_cv_ksymtab_sys_setresgid" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_setresgid="N$cr_cv_ksymtab_sys_setresgid" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -52281,18 +38474,18 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +-fi +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for expand_files" >&5 +-echo $ECHO_N "checking kernel symbol table for expand_files... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_expand_files+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++fi ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for expand_files" >&5 ++$as_echo_n "checking kernel symbol table for expand_files... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_expand_files+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_expand_files=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}expand_files$/ {s/ .*//p;q;}"` +@@ -52308,11 +38501,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -52332,42 +38521,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_expand_files="Y$cr_cv_ksymtab_expand_files" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_expand_files="N$cr_cv_ksymtab_expand_files" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -52397,17 +38562,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for __flush_icache_range" >&5 +-echo $ECHO_N "checking kernel symbol table for __flush_icache_range... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab___flush_icache_range+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for __flush_icache_range" >&5 ++$as_echo_n "checking kernel symbol table for __flush_icache_range... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab___flush_icache_range+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab___flush_icache_range=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__flush_icache_range$/ {s/ .*//p;q;}"` +@@ -52423,11 +38588,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -52447,42 +38608,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab___flush_icache_range="Y$cr_cv_ksymtab___flush_icache_range" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab___flush_icache_range="N$cr_cv_ksymtab___flush_icache_range" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -52493,9 +38630,7 @@ + cr_result='not found' + else + if expr "$cr_cv_ksymtab___flush_icache_range" : N >/dev/null; then +- { { echo "$as_me:$LINENO: error: Found symbol __flush_icache_range but no declaration -- please file a bug report." >&5 +-echo "$as_me: error: Found symbol __flush_icache_range but no declaration -- please file a bug report." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Found symbol __flush_icache_range but no declaration -- please file a bug report." "$LINENO" 5 + fi + cr_result=`echo $cr_cv_ksymtab___flush_icache_range | tr -d 'YN'` + if test $cr_result = 0; then +@@ -52511,17 +38646,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for sys_link" >&5 +-echo $ECHO_N "checking kernel symbol table for sys_link... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_sys_link+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for sys_link" >&5 ++$as_echo_n "checking kernel symbol table for sys_link... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_sys_link+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_sys_link=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}sys_link$/ {s/ .*//p;q;}"` +@@ -52537,11 +38672,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -52561,42 +38692,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_link="Y$cr_cv_ksymtab_sys_link" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_sys_link="N$cr_cv_ksymtab_sys_link" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -52626,17 +38733,17 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for lookup_create" >&5 +-echo $ECHO_N "checking kernel symbol table for lookup_create... $ECHO_C" >&6 +- # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate +- # if a declaration was found or not, and the address or 0 as the rest. +- if test "${cr_cv_ksymtab_lookup_create+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for lookup_create" >&5 ++$as_echo_n "checking kernel symbol table for lookup_create... " >&6; } ++ # Our cacheval is encoded with 'Y' or 'N' as the first char to indicate ++ # if a declaration was found or not, and the address or 0 as the rest. ++ if test "${cr_cv_ksymtab_lookup_create+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_lookup_create=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}lookup_create$/ {s/ .*//p;q;}"` +@@ -52652,11 +38759,7 @@ + CC=$KCC + CFLAGS="" + CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -52676,42 +38779,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_lookup_create="Y$cr_cv_ksymtab_lookup_create" + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_ksymtab_lookup_create="N$cr_cv_ksymtab_lookup_create" + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + +@@ -52741,8 +38820,8 @@ + _ACEOF + + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + +@@ -52756,10 +38835,10 @@ + + + +- echo "$as_me:$LINENO: checking kernel symbol table for exported register_chrdev" >&5 +-echo $ECHO_N "checking kernel symbol table for exported register_chrdev... $ECHO_C" >&6 +- if test "${cr_cv_ksymtab_exp_register_chrdev+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for exported register_chrdev" >&5 ++$as_echo_n "checking kernel symbol table for exported register_chrdev... " >&6; } ++ if test "${cr_cv_ksymtab_exp_register_chrdev+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_exp_register_chrdev=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}register_chrdev$/ {s/ .*//p;q;}"` +@@ -52782,11 +38861,44 @@ + cr_result='not found' + cr_addr=0 + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + if test "$cr_addr" = "0"; then + ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for exported __register_chrdev" >&5 ++$as_echo_n "checking kernel symbol table for exported __register_chrdev... " >&6; } ++ if test "${cr_cv_ksymtab_exp___register_chrdev+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ cr_cv_ksymtab_exp___register_chrdev=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}__register_chrdev$/ {s/ .*//p;q;}"` ++ if test -n "$cr_cv_ksymtab_exp___register_chrdev" && eval $LINUX_SYMTAB_CMD | grep " __ksymtab___register_chrdev\$" >/dev/null; then ++ : # keep it ++ else ++ cr_cv_ksymtab_exp___register_chrdev='' ++ fi ++fi ++ ++ if test -n "$cr_cv_ksymtab_exp___register_chrdev"; then ++ cr_result="$cr_cv_ksymtab_exp___register_chrdev" ++ cr_addr="0x$cr_cv_ksymtab_exp___register_chrdev" ++ ++cat >>confdefs.h <<_ACEOF ++#define CR_EXPORTED_KCODE___register_chrdev $cr_addr ++_ACEOF ++ ++ else ++ cr_result='not found' ++ cr_addr=0 ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ if test "$cr_addr" = "0"; then ++ + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +@@ -52805,39 +38917,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -52851,18 +38983,17 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - kernel does not export register_chrdev" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - kernel does not export register_chrdev" >&2;} +- { (exit 1); exit 1; }; } +- +-fi +- +- +- +- echo "$as_me:$LINENO: checking kernel symbol table for exported register_blkdev" >&5 +-echo $ECHO_N "checking kernel symbol table for exported register_blkdev... $ECHO_C" >&6 +- if test "${cr_cv_ksymtab_exp_register_blkdev+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 ++ as_fn_error "Unable to use kernel $LINUX_VER - kernel does not export register_chrdev or __register_chrdev" "$LINENO" 5 ++ ++ fi ++fi ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel symbol table for exported register_blkdev" >&5 ++$as_echo_n "checking kernel symbol table for exported register_blkdev... " >&6; } ++ if test "${cr_cv_ksymtab_exp_register_blkdev+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else + + cr_cv_ksymtab_exp_register_blkdev=`eval $LINUX_SYMTAB_CMD | sed -n -e "/${CR_KSYM_PATTERN_CODE}register_blkdev$/ {s/ .*//p;q;}"` +@@ -52885,8 +39016,8 @@ + cr_result='not found' + cr_addr=0 + fi +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + if test "$cr_addr" = "0"; then + +@@ -52908,39 +39039,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -52954,36 +39105,29 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - kernel does not export register_blkdev" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - kernel does not export register_blkdev" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Unable to use kernel $LINUX_VER - kernel does not export register_blkdev" "$LINENO" 5 + + fi + # One of {init,system}_utsname is used to validate UTS_RELEASE + + + +- +- echo "$as_me:$LINENO: checking kernel for init_utsname" >&5 +-echo $ECHO_N "checking kernel for init_utsname... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_INIT_UTSNAME+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for init_utsname" >&5 ++$as_echo_n "checking kernel for init_utsname... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_INIT_UTSNAME+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -53007,42 +39151,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_INIT_UTSNAME=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_INIT_UTSNAME=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -53050,48 +39170,39 @@ + cr_result=$cr_cv_kconfig_HAVE_INIT_UTSNAME + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_INIT_UTSNAME 1 +-_ACEOF ++ $as_echo "#define HAVE_INIT_UTSNAME 1" >>confdefs.h + + HAVE_INIT_UTSNAME=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_INIT_UTSNAME 0 +-_ACEOF ++ $as_echo "#define HAVE_INIT_UTSNAME 0" >>confdefs.h + + HAVE_INIT_UTSNAME='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 +- +- +- +- +- +- +- echo "$as_me:$LINENO: checking kernel for system_utsname" >&5 +-echo $ECHO_N "checking kernel for system_utsname... $ECHO_C" >&6 +- +- if test "${cr_cv_kconfig_HAVE_SYSTEM_UTSNAME+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- +- SAVE_CC=$CC +- SAVE_CFLAGS=$CFLAGS +- SAVE_CPPFLAGS=$CPPFLAGS +- CC=$KCC +- CFLAGS="" +- CPPFLAGS="$KCFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for system_utsname" >&5 ++$as_echo_n "checking kernel for system_utsname... " >&6; } ++ ++ if test "${cr_cv_kconfig_HAVE_SYSTEM_UTSNAME+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ ++ ++ SAVE_CC=$CC ++ SAVE_CFLAGS=$CFLAGS ++ SAVE_CPPFLAGS=$CPPFLAGS ++ CC=$KCC ++ CFLAGS="" ++ CPPFLAGS="$KCFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include +@@ -53110,42 +39221,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then ++if ac_fn_c_try_compile "$LINENO"; then : + CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_SYSTEM_UTSNAME=yes + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-CC=$SAVE_CC ++ CC=$SAVE_CC + CFLAGS=$SAVE_CFLAGS + CPPFLAGS=$SAVE_CPPFLAGS + cr_cv_kconfig_HAVE_SYSTEM_UTSNAME=no + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + fi +@@ -53153,22 +39240,18 @@ + cr_result=$cr_cv_kconfig_HAVE_SYSTEM_UTSNAME + + if test $cr_result = yes; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SYSTEM_UTSNAME 1 +-_ACEOF ++ $as_echo "#define HAVE_SYSTEM_UTSNAME 1" >>confdefs.h + + HAVE_SYSTEM_UTSNAME=1 + else +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SYSTEM_UTSNAME 0 +-_ACEOF ++ $as_echo "#define HAVE_SYSTEM_UTSNAME 0" >>confdefs.h + + HAVE_SYSTEM_UTSNAME='' + fi + + +- echo "$as_me:$LINENO: result: $cr_result" >&5 +-echo "${ECHO_T}$cr_result" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cr_result" >&5 ++$as_echo "$cr_result" >&6; } + + + if test -z "${HAVE_INIT_UTSNAME}${HAVE_SYSTEM_UTSNAME}"; then +@@ -53191,39 +39274,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -53237,9 +39340,7 @@ + echo " Kernel running currently = `uname -r`" + echo "======================================================================" + +- { { echo "$as_me:$LINENO: error: Unable to use kernel $LINUX_VER - unable to determine how to query UTSNAME" >&5 +-echo "$as_me: error: Unable to use kernel $LINUX_VER - unable to determine how to query UTSNAME" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Unable to use kernel $LINUX_VER - unable to determine how to query UTSNAME" "$LINENO" 5 + + fi + +@@ -53253,37 +39354,28 @@ + + + if test x"$cr_build_libcr" = xyes && expr $CR_ARCH : ppc >/dev/null; then +- echo "$as_me:$LINENO: checking for work around for bug 2524" >&5 +-echo $ECHO_N "checking for work around for bug 2524... $ECHO_C" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for work around for bug 2524" >&5 ++$as_echo_n "checking for work around for bug 2524... " >&6; } + if test "$cr_build_modules,$force_bug2524" = "yes,"; then + if test `echo $LINUX_VER | sed -e 's/2.6.\([0-9]*\).*/\1/'` -le 15; then +- { { echo "$as_me:$LINENO: error: Because you are building for a PowerPC kernel 2.6.15 or older, you must specify either --with-bug2524 or --without-bug2524. If in doubt --with-bug2524 is the safe option (with a small performance penalty)." >&5 +-echo "$as_me: error: Because you are building for a PowerPC kernel 2.6.15 or older, you must specify either --with-bug2524 or --without-bug2524. If in doubt --with-bug2524 is the safe option (with a small performance penalty)." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "Because you are building for a PowerPC kernel 2.6.15 or older, you must specify either --with-bug2524 or --without-bug2524. If in doubt --with-bug2524 is the safe option (with a small performance penalty)." "$LINENO" 5 + fi + fi + case "$force_bug2524" in + yes|no) ;; # nothing to do + '') force_bug2524=no ;; # empty is no +- *) { { echo "$as_me:$LINENO: error: Argument to --with-bug2524 must be 'yes', 'no' or empty" >&5 +-echo "$as_me: error: Argument to --with-bug2524 must be 'yes', 'no' or empty" >&2;} +- { (exit 1); exit 1; }; } ;; +- esac +- echo "$as_me:$LINENO: result: $force_bug2524" >&5 +-echo "${ECHO_T}$force_bug2524" >&6 ++ *) as_fn_error "Argument to --with-bug2524 must be 'yes', 'no' or empty" "$LINENO" 5 ;; ++ esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $force_bug2524" >&5 ++$as_echo "$force_bug2524" >&6; } + + if test x$force_bug2524 = xyes; then +- cat >>confdefs.h <<\_ACEOF +-#define CR_HAVE_BUG2524 1 +-_ACEOF +- +- else +- cat >>confdefs.h <<\_ACEOF +-#define CR_HAVE_BUG2524 0 +-_ACEOF +- +- fi +- ++ $as_echo "#define CR_HAVE_BUG2524 1" >>confdefs.h ++ ++ else ++ $as_echo "#define CR_HAVE_BUG2524 0" >>confdefs.h ++ ++ fi + + + fi +@@ -53291,9 +39383,7 @@ + ################################################################################ + # AM_CONDITIONAL may not be called contitionally, so these go here + ################################################################################ +- +- +-if echo $LINUX_SYMTAB_CMD | grep ^cat >/dev/null 2>&1; then ++ if echo $LINUX_SYMTAB_CMD | grep ^cat >/dev/null 2>&1; then + CR_HAVE_SYSTEM_MAP_TRUE= + CR_HAVE_SYSTEM_MAP_FALSE='#' + else +@@ -53301,9 +39391,7 @@ + CR_HAVE_SYSTEM_MAP_FALSE= + fi + +- +- +-if test x$cr_build_util$cross_compiling = xyesno; then ++ if test x$cr_build_util$cross_compiling = xyesno; then + CR_BUILD_MAN_TRUE= + CR_BUILD_MAN_FALSE='#' + else +@@ -53311,9 +39399,7 @@ + CR_BUILD_MAN_FALSE= + fi + +- +- +-if test x$cr_have_ftb = xyes; then ++ if test x$cr_have_ftb = xyes; then + CR_HAVE_FTB_TRUE= + CR_HAVE_FTB_FALSE='#' + else +@@ -53321,9 +39407,7 @@ + CR_HAVE_FTB_FALSE= + fi + +- +- +-if test "x$CXX" != xno; then ++ if test "x$CXX" != xno; then + CR_HAVE_CXX_TRUE= + CR_HAVE_CXX_FALSE='#' + else +@@ -53353,9 +39437,7 @@ + ################################################################################ + # Enable/disable building various pieces of the code + ################################################################################ +- +- +-if test x$enable_cr_info = xyes; then ++ if test x$enable_cr_info = xyes; then + BUILD_CR_INFO_TRUE= + BUILD_CR_INFO_FALSE='#' + else +@@ -53363,9 +39445,7 @@ + BUILD_CR_INFO_FALSE= + fi + +- +- +-if false; then ++ if false; then + BUILD_VMADLIB_TRUE= + BUILD_VMADLIB_FALSE='#' + else +@@ -53373,9 +39453,7 @@ + BUILD_VMADLIB_FALSE= + fi + +- +- +-if test x$cr_build_modules = xyes; then ++ if test x$cr_build_modules = xyes; then + CR_BUILD_MODULES_TRUE= + CR_BUILD_MODULES_FALSE='#' + else +@@ -53383,9 +39461,7 @@ + CR_BUILD_MODULES_FALSE= + fi + +- +- +-if test x$cr_build_util = xyes; then ++ if test x$cr_build_util = xyes; then + CR_BUILD_UTIL_TRUE= + CR_BUILD_UTIL_FALSE='#' + else +@@ -53393,9 +39469,7 @@ + CR_BUILD_UTIL_FALSE= + fi + +- +- +-if test x$cr_build_libcr = xyes; then ++ if test x$cr_build_libcr = xyes; then + CR_BUILD_LIBCR_TRUE= + CR_BUILD_LIBCR_FALSE='#' + else +@@ -53403,9 +39477,7 @@ + CR_BUILD_LIBCR_FALSE= + fi + +- +- +-if test x$cr_build_include = xyes; then ++ if test x$cr_build_include = xyes; then + CR_BUILD_INCLUDE_TRUE= + CR_BUILD_INCLUDE_FALSE='#' + else +@@ -53413,9 +39485,7 @@ + CR_BUILD_INCLUDE_FALSE= + fi + +- +- +-if test x$cr_build_tests = xyes; then ++ if test x$cr_build_tests = xyes; then + CR_BUILD_TESTS_TRUE= + CR_BUILD_TESTS_FALSE='#' + else +@@ -53423,9 +39493,7 @@ + CR_BUILD_TESTS_FALSE= + fi + +- +- +-if test x$cr_build_examples = xyes; then ++ if test x$cr_build_examples = xyes; then + CR_BUILD_EXAMPLES_TRUE= + CR_BUILD_EXAMPLES_FALSE='#' + else +@@ -53433,9 +39501,7 @@ + CR_BUILD_EXAMPLES_FALSE= + fi + +- +- +-if test x$cr_build_contrib = xyes; then ++ if test x$cr_build_contrib = xyes; then + CR_BUILD_CONTRIB_TRUE= + CR_BUILD_CONTRIB_FALSE='#' + else +@@ -53448,40 +39514,40 @@ + # Finally generate the files and a report (unless supressed) + ################################################################################ + if test x"$cr_build_modules" = xyes; then +- ac_config_files="$ac_config_files cr_module/Makefile cr_module/kbuild/Makefile vmadump4/Makefile include/blcr_imports.h blcr_imports/imports.c blcr_imports/Makefile blcr_imports/kbuild/Makefile config/kbuild.mak" ++ ac_config_files="$ac_config_files cr_module/Makefile cr_module/kbuild/Makefile vmadump4/Makefile include/blcr_imports.h blcr_imports/imports.c blcr_imports/Makefile blcr_imports/kbuild/Makefile config/kbuild.mak" + + fi + if test x"$cr_build_util" = xyes; then +- ac_config_files="$ac_config_files util/Makefile util/cr_checkpoint/Makefile util/cr_restart/Makefile util/cr_run/Makefile util/cr_info/Makefile man/Makefile" ++ ac_config_files="$ac_config_files util/Makefile util/cr_checkpoint/Makefile util/cr_restart/Makefile util/cr_run/Makefile util/cr_info/Makefile man/Makefile" + + fi + if test x"$cr_build_libcr" = xyes; then +- ac_config_files="$ac_config_files libcr/Makefile" ++ ac_config_files="$ac_config_files libcr/Makefile" + + fi + if test x"$cr_build_tests" = xyes; then +- ac_config_files="$ac_config_files tests/Makefile" +- +- ac_config_files="$ac_config_files tests/shellinit" ++ ac_config_files="$ac_config_files tests/Makefile" ++ ++ ac_config_files="$ac_config_files tests/shellinit" + + fi + if test x"$cr_build_examples" = xyes; then +- ac_config_files="$ac_config_files examples/Makefile examples/counting/Makefile examples/pthread_counting/Makefile examples/pthread_misc/Makefile examples/file_counting/Makefile examples/io_bench/Makefile examples/pipe_counting/Makefile" ++ ac_config_files="$ac_config_files examples/Makefile examples/counting/Makefile examples/pthread_counting/Makefile examples/pthread_misc/Makefile examples/file_counting/Makefile examples/io_bench/Makefile examples/pipe_counting/Makefile" + + fi + if test x"$cr_build_contrib" = xyes; then +- ac_config_files="$ac_config_files contrib/Makefile" +- +- ac_config_files="$ac_config_files contrib/cr_insmod" +- +- ac_config_files="$ac_config_files contrib/gen_cscope" +- +- ac_config_files="$ac_config_files contrib/batch_build" +- +-fi +- ac_config_headers="$ac_config_headers blcr_config.h" +- +- ac_config_files="$ac_config_files Makefile etc/Makefile rpm/Makefile rpm/specfile include/Makefile include/blcr_common.h doc/Makefile" ++ ac_config_files="$ac_config_files contrib/Makefile" ++ ++ ac_config_files="$ac_config_files contrib/cr_insmod" ++ ++ ac_config_files="$ac_config_files contrib/gen_cscope" ++ ++ ac_config_files="$ac_config_files contrib/batch_build" ++ ++fi ++ac_config_headers="$ac_config_headers blcr_config.h" ++ ++ac_config_files="$ac_config_files Makefile etc/Makefile rpm/Makefile rpm/specfile include/Makefile include/blcr_common.h doc/Makefile" + + + cat >confcache <<\_ACEOF +@@ -53502,39 +39568,59 @@ + + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-{ ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ + (set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; ++ ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n \ +- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" +- ;; +- esac; +-} | ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | + sed ' ++ /^ac_cv_env_/b end + t clear +- : clear ++ :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end +- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- : end' >>confcache +-if diff $cache_file confcache >/dev/null 2>&1; then :; else +- if test -w $cache_file; then +- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -53543,241 +39629,165 @@ + # Let make expand exec_prefix. + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +-# trailing colons and then remove the whole line if VPATH becomes empty +-# (actually we leave an empty line to preserve line numbers). +-if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/; +-s/:*\${srcdir}:*/:/; +-s/:*@srcdir@:*/:/; +-s/^\([^=]*=[ ]*\):*/\1/; +-s/:*$//; +-s/^[^=]*=[ ]*$//; +-}' +-fi +- + DEFS=-DHAVE_CONFIG_H + + ac_libobjs= + ac_ltlibobjs= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. +- ac_i=`echo "$ac_i" | +- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` +- # 2. Add them. +- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" +- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' ++ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ++ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` ++ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR ++ # will be set to the directory where LIBOBJS objects are built. ++ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' + done + LIBOBJS=$ac_libobjs + + LTLIBOBJS=$ac_ltlibobjs + + ++ if test -n "$EXEEXT"; then ++ am__EXEEXT_TRUE= ++ am__EXEEXT_FALSE='#' ++else ++ am__EXEEXT_TRUE='#' ++ am__EXEEXT_FALSE= ++fi ++ ++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then ++ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${CRI_DEBUG_TRUE}" && test -z "${CRI_DEBUG_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CRI_DEBUG\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CRI_DEBUG\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CRI_DEBUG\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${LIBCR_TRACING_TRUE}" && test -z "${LIBCR_TRACING_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"LIBCR_TRACING\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"LIBCR_TRACING\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"LIBCR_TRACING\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_KERNEL_TRACING_TRUE}" && test -z "${CR_KERNEL_TRACING_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_KERNEL_TRACING\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_KERNEL_TRACING\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_KERNEL_TRACING\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_BUILD_ETC_TRUE}" && test -z "${CR_BUILD_ETC_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_BUILD_ETC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_BUILD_ETC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_BUILD_ETC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_INSTALLED_LIBCR_TRUE}" && test -z "${CR_INSTALLED_LIBCR_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_INSTALLED_LIBCR\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_INSTALLED_LIBCR\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_INSTALLED_LIBCR\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_INSTALLED_UTIL_TRUE}" && test -z "${CR_INSTALLED_UTIL_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_INSTALLED_UTIL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_INSTALLED_UTIL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_INSTALLED_UTIL\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_BUILD_TESTSUITE_TRUE}" && test -z "${CR_BUILD_TESTSUITE_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_BUILD_TESTSUITE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_BUILD_TESTSUITE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_BUILD_TESTSUITE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${CR_ENABLE_STATIC_TRUE}" && test -z "${CR_ENABLE_STATIC_FALSE}"; then ++ as_fn_error "conditional \"CR_ENABLE_STATIC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${CR_ENABLE_SHARED_TRUE}" && test -z "${CR_ENABLE_SHARED_FALSE}"; then ++ as_fn_error "conditional \"CR_ENABLE_SHARED\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_RPMBUILD_TRUE}" && test -z "${HAVE_RPMBUILD_FALSE}"; then ++ as_fn_error "conditional \"HAVE_RPMBUILD\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then ++ as_fn_error "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${CR_ENABLE_STATIC_TRUE}" && test -z "${CR_ENABLE_STATIC_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_ENABLE_STATIC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_ENABLE_STATIC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${CR_ENABLE_SHARED_TRUE}" && test -z "${CR_ENABLE_SHARED_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_ENABLE_SHARED\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_ENABLE_SHARED\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${HAVE_RPMBUILD_TRUE}" && test -z "${HAVE_RPMBUILD_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"HAVE_RPMBUILD\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"HAVE_RPMBUILD\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCXX\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then ++ as_fn_error "conditional \"am__fastdepCXX\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then ++ as_fn_error "conditional \"am__fastdepCXX\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_BUILD_LIBCR32_TRUE}" && test -z "${CR_BUILD_LIBCR32_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_BUILD_LIBCR32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_BUILD_LIBCR32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_BUILD_LIBCR32\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_HAVE_SYSTEM_MAP_TRUE}" && test -z "${CR_HAVE_SYSTEM_MAP_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_HAVE_SYSTEM_MAP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_HAVE_SYSTEM_MAP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_HAVE_SYSTEM_MAP\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_BUILD_MAN_TRUE}" && test -z "${CR_BUILD_MAN_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_BUILD_MAN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_BUILD_MAN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_BUILD_MAN\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_HAVE_FTB_TRUE}" && test -z "${CR_HAVE_FTB_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_HAVE_FTB\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_HAVE_FTB\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_HAVE_FTB\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_HAVE_CXX_TRUE}" && test -z "${CR_HAVE_CXX_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_HAVE_CXX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_HAVE_CXX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_HAVE_CXX\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${BUILD_CR_INFO_TRUE}" && test -z "${BUILD_CR_INFO_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"BUILD_CR_INFO\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"BUILD_CR_INFO\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"BUILD_CR_INFO\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${BUILD_VMADLIB_TRUE}" && test -z "${BUILD_VMADLIB_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"BUILD_VMADLIB\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"BUILD_VMADLIB\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"BUILD_VMADLIB\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_BUILD_MODULES_TRUE}" && test -z "${CR_BUILD_MODULES_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_BUILD_MODULES\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_BUILD_MODULES\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_BUILD_MODULES\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_BUILD_UTIL_TRUE}" && test -z "${CR_BUILD_UTIL_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_BUILD_UTIL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_BUILD_UTIL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_BUILD_UTIL\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_BUILD_LIBCR_TRUE}" && test -z "${CR_BUILD_LIBCR_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_BUILD_LIBCR\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_BUILD_LIBCR\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_BUILD_LIBCR\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_BUILD_INCLUDE_TRUE}" && test -z "${CR_BUILD_INCLUDE_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_BUILD_INCLUDE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_BUILD_INCLUDE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_BUILD_INCLUDE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_BUILD_TESTS_TRUE}" && test -z "${CR_BUILD_TESTS_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_BUILD_TESTS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_BUILD_TESTS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_BUILD_TESTS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_BUILD_EXAMPLES_TRUE}" && test -z "${CR_BUILD_EXAMPLES_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_BUILD_EXAMPLES\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_BUILD_EXAMPLES\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_BUILD_EXAMPLES\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${CR_BUILD_CONTRIB_TRUE}" && test -z "${CR_BUILD_CONTRIB_FALSE}"; then +- { { echo "$as_me:$LINENO: error: conditional \"CR_BUILD_CONTRIB\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-echo "$as_me: error: conditional \"CR_BUILD_CONTRIB\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"CR_BUILD_CONTRIB\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + : ${CONFIG_STATUS=./config.status} ++ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +-echo "$as_me: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 ++$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} ++as_write_fail=0 ++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. +@@ -53787,81 +39797,252 @@ + debug=false + ac_cs_recheck=false + ac_cs_silent=false ++ + SHELL=\${CONFIG_SHELL-$SHELL} +-_ACEOF +- +-cat >>$CONFIG_STATUS <<\_ACEOF +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## +- +-# Be Bourne compatible +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++export SHELL ++_ASEOF ++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## ++ ++# Be more Bourne compatible ++DUALCASE=1; export DUALCASE # for MKS sh ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: +- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then +- set -o posix +-fi +-DUALCASE=1; export DUALCASE # for MKS sh +- +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi +- +- +-# Work around bugs in pre-3.0 UWIN ksh. +-$as_unset ENV MAIL MAILPATH ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac ++fi ++ ++ ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' ++ else ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in #( ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' ++ fi ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' ++fi ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } ++fi ++ ++ ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in #(( ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ exit 1 ++fi ++ ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : ++done + PS1='$ ' + PS2='> ' + PS4='+ ' + + # NLS nuisances. +-for as_var in \ +- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ +- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ +- LC_TELEPHONE LC_TIME +-do +- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then +- eval $as_var=C; export $as_var +- else +- $as_unset $as_var +- fi +-done +- +-# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1; then ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE ++ ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++ ++# as_fn_error ERROR [LINENO LOG_FD] ++# --------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with status $?, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr + else + as_expr=false + fi + +-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename + else + as_basename=false + fi + +- +-# Name of the executable. +-as_me=`$as_basename "$0" || ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)$' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } +- /^X\/\(\/\/\)$/{ s//\1/; q; } +- /^X\/\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- +- +-# PATH needs CR, and LINENO needs CR and PATH. ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ + # Avoid depending upon Character Ranges. + as_cr_letters='abcdefghijklmnopqrstuvwxyz' + as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +@@ -53869,148 +40050,123 @@ + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- echo "#! /bin/sh" >conf$$.sh +- echo "exit 0" >>conf$$.sh +- chmod +x conf$$.sh +- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then +- PATH_SEPARATOR=';' +- else +- PATH_SEPARATOR=: +- fi +- rm -f conf$$.sh +-fi +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" || { +- # Find who we are. Look in the path if we contain no path at all +- # relative or not. +- case $0 in +- *[\\/]* ) as_myself=$0 ;; +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done +- +- ;; +- esac +- # We did not find ourselves, most probably we were run as `sh COMMAND' +- # in which case we are not to be found in the path. +- if test "x$as_myself" = x; then +- as_myself=$0 +- fi +- if test ! -f "$as_myself"; then +- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} +- { (exit 1); exit 1; }; } +- fi +- case $CONFIG_SHELL in +- '') +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for as_base in sh bash ksh sh5; do +- case $as_dir in +- /*) +- if ("$as_dir/$as_base" -c ' +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then +- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } +- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } +- CONFIG_SHELL=$as_dir/$as_base +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$0" ${1+"$@"} +- fi;; +- esac +- done +-done +-;; +- esac +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line before each line; the second 'sed' does the real +- # work. The second script uses 'N' to pair each line-number line +- # with the numbered line, and appends trailing '-' during +- # substitution so that $LINENO is not a special case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) +- sed '=' <$as_myself | +- sed ' +- N +- s,$,-, +- : loop +- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, +- t loop +- s,-$,, +- s,^['$as_cr_digits']*\n,, +- ' >$as_me.lineno && +- chmod +x $as_me.lineno || +- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} +- { (exit 1); exit 1; }; } +- +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensible to this). +- . ./$as_me.lineno +- # Exit status is that of the last command. +- exit +-} +- +- +-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +- *c*,-n*) ECHO_N= ECHO_C=' +-' ECHO_T=' ' ;; +- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; +- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +-esac +- +-if expr a : '\(a\)' >/dev/null 2>&1; then +- as_expr=expr +-else +- as_expr=false +-fi ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in #((((( ++-n*) ++ case `echo 'xy\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac + + rm -f conf$$ conf$$.exe conf$$.file +-echo >conf$$.file +-if ln -s conf$$.file conf$$ 2>/dev/null; then +- # We could just check for DJGPP; but this test a) works b) is more generic +- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). +- if test -f conf$$.exe; then +- # Don't use ln at all; we don't have any links ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir 2>/dev/null ++fi ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else + as_ln_s='cp -p' +- else +- as_ln_s='ln -s' +- fi +-elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln ++ fi + else + as_ln_s='cp -p' + fi +-rm -f conf$$ conf$$.exe conf$$.file +- ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null ++ ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ ++ ++} # as_fn_mkdir_p + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false + fi + +-as_executable_p="test -f" ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' ++else ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L ++ else ++ as_ls_L_option= ++ fi ++ as_test_x=' ++ eval sh -c '\'' ++ if test -d "$1"; then ++ test -d "$1/."; ++ else ++ case $1 in #( ++ -*)set "./$1";; ++ esac; ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ++ ???[sx]*):;;*)false;;esac;fi ++ '\'' sh ++ ' ++fi ++as_executable_p=$as_test_x + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -54019,31 +40175,20 @@ + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +-# IFS +-# We need space, tab and new line, in precisely that order. +-as_nl=' +-' +-IFS=" $as_nl" +- +-# CDPATH. +-$as_unset CDPATH +- + exec 6>&1 +- +-# Open the log real soon, to keep \$[0] and so on meaningful, and to ++## ----------------------------------- ## ++## Main body of $CONFIG_STATUS script. ## ++## ----------------------------------- ## ++_ASEOF ++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# Save the log message, to keep $0 and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their +-# values after options handling. Logging --version etc. is OK. +-exec 5>>config.log +-{ +- echo +- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +-## Running $as_me. ## +-_ASBOX +-} >&5 +-cat >&5 <<_CSEOF +- ++# values after options handling. ++ac_log=" + This file was extended by blcr $as_me 0.8.2, which was +-generated by GNU Autoconf 2.59. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -54051,45 +40196,47 @@ + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +-_CSEOF +-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +-echo >&5 +-_ACEOF +- ++on `(hostname || uname -n) 2>/dev/null | sed 1q` ++" ++ ++_ACEOF ++ ++case $ac_config_files in *" ++"*) set x $ac_config_files; shift; ac_config_files=$*;; ++esac ++ ++case $ac_config_headers in *" ++"*) set x $ac_config_headers; shift; ac_config_headers=$*;; ++esac ++ ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + # Files that config.status was made for. +-if test -n "$ac_config_files"; then +- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +-fi +- +-if test -n "$ac_config_headers"; then +- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +-fi +- +-if test -n "$ac_config_links"; then +- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +-fi +- +-if test -n "$ac_config_commands"; then +- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +-fi +- +-cat >>$CONFIG_STATUS <<\_ACEOF +- ++config_files="$ac_config_files" ++config_headers="$ac_config_headers" ++config_commands="$ac_config_commands" ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ac_cs_usage="\ +-\`$as_me' instantiates files from templates according to the +-current configuration. +- +-Usage: $0 [OPTIONS] [FILE]... ++\`$as_me' instantiates files and other configuration actions ++from templates according to the current configuration. Unless the files ++and actions are specified as TAGs, all are instantiated by default. ++ ++Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit +- -V, --version print version number, then exit +- -q, --quiet do not print progress messages ++ -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit ++ -q, --quiet, --silent ++ do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +- --file=FILE[:TEMPLATE] +- instantiate the configuration file FILE +- --header=FILE[:TEMPLATE] +- instantiate the configuration header FILE ++ --file=FILE[:TEMPLATE] ++ instantiate the configuration file FILE ++ --header=FILE[:TEMPLATE] ++ instantiate the configuration header FILE + + Configuration files: + $config_files +@@ -54100,84 +40247,86 @@ + Configuration commands: + $config_commands + +-Report bugs to ." +-_ACEOF +- +-cat >>$CONFIG_STATUS <<_ACEOF ++Report bugs to ." ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + blcr config.status 0.8.2 +-configured by $0, generated by GNU Autoconf 2.59, +- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +- +-Copyright (C) 2003 Free Software Foundation, Inc. ++configured by $0, generated by GNU Autoconf 2.65, ++ with options \\"\$ac_cs_config\\" ++ ++Copyright (C) 2009 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." +-srcdir=$srcdir +-INSTALL="$INSTALL" +-_ACEOF +- +-cat >>$CONFIG_STATUS <<\_ACEOF +-# If no file are specified by the user, then we need to provide default +-# value. By we need to know if files were specified by the user. ++ ++ac_pwd='$ac_pwd' ++srcdir='$srcdir' ++INSTALL='$INSTALL' ++MKDIR_P='$MKDIR_P' ++AWK='$AWK' ++test -n "\$AWK" || AWK=awk ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# The default lists apply if the user does not specify any file. + ac_need_defaults=: + while test $# != 0 + do + case $1 in + --*=*) +- ac_option=`expr "x$1" : 'x\([^=]*\)='` +- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; +- -*) ++ *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; +- *) # This is not an option, so the user has probably given explicit +- # arguments. +- ac_option=$1 +- ac_need_defaults=false;; + esac + + case $ac_option in + # Handling of the options. +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; +- --version | --vers* | -V ) +- echo "$ac_cs_version"; exit 0 ;; +- --he | --h) +- # Conflict between --help and --header +- { { echo "$as_me:$LINENO: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&5 +-echo "$as_me: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&2;} +- { (exit 1); exit 1; }; };; +- --help | --hel | -h ) +- echo "$ac_cs_usage"; exit 0 ;; +- --debug | --d* | -d ) ++ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) ++ $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; ++ --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift +- CONFIG_FILES="$CONFIG_FILES $ac_optarg" ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift +- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; ++ --he | --h) ++ # Conflict between --help and --header ++ as_fn_error "ambiguous option: \`$1' ++Try \`$0 --help' for more information.";; ++ --help | --hel | -h ) ++ $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. +- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&5 +-echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2;} +- { (exit 1); exit 1; }; } ;; +- +- *) ac_config_targets="$ac_config_targets $1" ;; ++ -*) as_fn_error "unrecognized option: \`$1' ++Try \`$0 --help' for more information." ;; ++ ++ *) as_fn_append ac_config_targets " $1" ++ ac_need_defaults=false ;; + + esac + shift +@@ -54191,72 +40340,436 @@ + fi + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + if \$ac_cs_recheck; then +- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 +- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +-fi +- +-_ACEOF +- +-cat >>$CONFIG_STATUS <<_ACEOF +-# +-# INIT-COMMANDS section. +-# +- ++ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ shift ++ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 ++ CONFIG_SHELL='$SHELL' ++ export CONFIG_SHELL ++ exec "\$@" ++fi ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++exec 5>>config.log ++{ ++ echo ++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ++## Running $as_me. ## ++_ASBOX ++ $as_echo "$ac_log" ++} >&5 ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++# ++# INIT-COMMANDS ++# + AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + +-_ACEOF +- +- +- +-cat >>$CONFIG_STATUS <<\_ACEOF ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++sed_quote_subst='$sed_quote_subst' ++double_quote_subst='$double_quote_subst' ++delay_variable_subst='$delay_variable_subst' ++enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' ++macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' ++macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' ++enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' ++pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' ++enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' ++host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' ++host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' ++host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' ++build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' ++build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' ++build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' ++SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' ++Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' ++GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' ++EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' ++FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' ++LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' ++NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' ++LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' ++max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' ++ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' ++exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' ++lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' ++lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' ++lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' ++reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' ++reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' ++deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' ++file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' ++AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' ++AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' ++STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' ++RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' ++old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' ++CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' ++compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' ++GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' ++objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' ++SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' ++ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' ++MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' ++need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' ++DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' ++NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' ++LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' ++OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' ++OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' ++libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' ++shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' ++enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' ++export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' ++whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' ++allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' ++no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' ++inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' ++link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' ++fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' ++always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' ++export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' ++include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' ++prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' ++variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' ++need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' ++need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' ++version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' ++runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' ++shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' ++shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' ++libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' ++library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' ++soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' ++postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' ++sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' ++sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' ++enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' ++enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' ++enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' ++old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' ++striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' ++predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' ++postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' ++predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' ++postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' ++LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++ ++LTCC='$LTCC' ++LTCFLAGS='$LTCFLAGS' ++compiler='$compiler_DEFAULT' ++ ++# Quote evaled strings. ++for var in SED \ ++GREP \ ++EGREP \ ++FGREP \ ++LD \ ++NM \ ++LN_S \ ++lt_SP2NL \ ++lt_NL2SP \ ++reload_flag \ ++OBJDUMP \ ++deplibs_check_method \ ++file_magic_cmd \ ++AR \ ++AR_FLAGS \ ++STRIP \ ++RANLIB \ ++CC \ ++CFLAGS \ ++compiler \ ++lt_cv_sys_global_symbol_pipe \ ++lt_cv_sys_global_symbol_to_cdecl \ ++lt_cv_sys_global_symbol_to_c_name_address \ ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ ++SHELL \ ++ECHO \ ++lt_prog_compiler_no_builtin_flag \ ++lt_prog_compiler_wl \ ++lt_prog_compiler_pic \ ++lt_prog_compiler_static \ ++lt_cv_prog_compiler_c_o \ ++need_locks \ ++DSYMUTIL \ ++NMEDIT \ ++LIPO \ ++OTOOL \ ++OTOOL64 \ ++shrext_cmds \ ++export_dynamic_flag_spec \ ++whole_archive_flag_spec \ ++compiler_needs_object \ ++with_gnu_ld \ ++allow_undefined_flag \ ++no_undefined_flag \ ++hardcode_libdir_flag_spec \ ++hardcode_libdir_flag_spec_ld \ ++hardcode_libdir_separator \ ++fix_srcfile_path \ ++exclude_expsyms \ ++include_expsyms \ ++file_list_spec \ ++variables_saved_for_relink \ ++libname_spec \ ++library_names_spec \ ++soname_spec \ ++finish_eval \ ++old_striplib \ ++striplib \ ++compiler_lib_search_dirs \ ++predep_objects \ ++postdep_objects \ ++predeps \ ++postdeps \ ++compiler_lib_search_path \ ++LD_CXX \ ++compiler_CXX \ ++lt_prog_compiler_no_builtin_flag_CXX \ ++lt_prog_compiler_wl_CXX \ ++lt_prog_compiler_pic_CXX \ ++lt_prog_compiler_static_CXX \ ++lt_cv_prog_compiler_c_o_CXX \ ++export_dynamic_flag_spec_CXX \ ++whole_archive_flag_spec_CXX \ ++compiler_needs_object_CXX \ ++with_gnu_ld_CXX \ ++allow_undefined_flag_CXX \ ++no_undefined_flag_CXX \ ++hardcode_libdir_flag_spec_CXX \ ++hardcode_libdir_flag_spec_ld_CXX \ ++hardcode_libdir_separator_CXX \ ++fix_srcfile_path_CXX \ ++exclude_expsyms_CXX \ ++include_expsyms_CXX \ ++file_list_spec_CXX \ ++compiler_lib_search_dirs_CXX \ ++predep_objects_CXX \ ++postdep_objects_CXX \ ++predeps_CXX \ ++postdeps_CXX \ ++compiler_lib_search_path_CXX; do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[\\\\\\\`\\"\\\$]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Double-quote double-evaled strings. ++for var in reload_cmds \ ++old_postinstall_cmds \ ++old_postuninstall_cmds \ ++old_archive_cmds \ ++extract_expsyms_cmds \ ++old_archive_from_new_cmds \ ++old_archive_from_expsyms_cmds \ ++archive_cmds \ ++archive_expsym_cmds \ ++module_cmds \ ++module_expsym_cmds \ ++export_symbols_cmds \ ++prelink_cmds \ ++postinstall_cmds \ ++postuninstall_cmds \ ++finish_cmds \ ++sys_lib_search_path_spec \ ++sys_lib_dlsearch_path_spec \ ++old_archive_cmds_CXX \ ++old_archive_from_new_cmds_CXX \ ++old_archive_from_expsyms_cmds_CXX \ ++archive_cmds_CXX \ ++archive_expsym_cmds_CXX \ ++module_cmds_CXX \ ++module_expsym_cmds_CXX \ ++export_symbols_cmds_CXX \ ++prelink_cmds_CXX; do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[\\\\\\\`\\"\\\$]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Fix-up fallback echo if it was mangled by the above quoting rules. ++case \$lt_ECHO in ++*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` ++ ;; ++esac ++ ++ac_aux_dir='$ac_aux_dir' ++xsi_shell='$xsi_shell' ++lt_shell_append='$lt_shell_append' ++ ++# See if we are running on zsh, and set the options which allow our ++# commands through without removal of \ escapes INIT. ++if test -n "\${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++ ++ ++ PACKAGE='$PACKAGE' ++ VERSION='$VERSION' ++ TIMESTAMP='$TIMESTAMP' ++ RM='$RM' ++ ofile='$ofile' ++ ++ ++ ++ ++ ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++ ++# Handling of arguments. + for ac_config_target in $ac_config_targets + do +- case "$ac_config_target" in +- # Handling of arguments. +- "cr_module/Makefile" ) CONFIG_FILES="$CONFIG_FILES cr_module/Makefile" ;; +- "cr_module/kbuild/Makefile" ) CONFIG_FILES="$CONFIG_FILES cr_module/kbuild/Makefile" ;; +- "vmadump4/Makefile" ) CONFIG_FILES="$CONFIG_FILES vmadump4/Makefile" ;; +- "include/blcr_imports.h" ) CONFIG_FILES="$CONFIG_FILES include/blcr_imports.h" ;; +- "blcr_imports/imports.c" ) CONFIG_FILES="$CONFIG_FILES blcr_imports/imports.c" ;; +- "blcr_imports/Makefile" ) CONFIG_FILES="$CONFIG_FILES blcr_imports/Makefile" ;; +- "blcr_imports/kbuild/Makefile" ) CONFIG_FILES="$CONFIG_FILES blcr_imports/kbuild/Makefile" ;; +- "config/kbuild.mak" ) CONFIG_FILES="$CONFIG_FILES config/kbuild.mak" ;; +- "util/Makefile" ) CONFIG_FILES="$CONFIG_FILES util/Makefile" ;; +- "util/cr_checkpoint/Makefile" ) CONFIG_FILES="$CONFIG_FILES util/cr_checkpoint/Makefile" ;; +- "util/cr_restart/Makefile" ) CONFIG_FILES="$CONFIG_FILES util/cr_restart/Makefile" ;; +- "util/cr_run/Makefile" ) CONFIG_FILES="$CONFIG_FILES util/cr_run/Makefile" ;; +- "util/cr_info/Makefile" ) CONFIG_FILES="$CONFIG_FILES util/cr_info/Makefile" ;; +- "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; +- "libcr/Makefile" ) CONFIG_FILES="$CONFIG_FILES libcr/Makefile" ;; +- "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; +- "tests/shellinit" ) CONFIG_FILES="$CONFIG_FILES tests/shellinit" ;; +- "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; +- "examples/counting/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/counting/Makefile" ;; +- "examples/pthread_counting/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/pthread_counting/Makefile" ;; +- "examples/pthread_misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/pthread_misc/Makefile" ;; +- "examples/file_counting/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/file_counting/Makefile" ;; +- "examples/io_bench/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/io_bench/Makefile" ;; +- "examples/pipe_counting/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/pipe_counting/Makefile" ;; +- "contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; +- "contrib/cr_insmod" ) CONFIG_FILES="$CONFIG_FILES contrib/cr_insmod" ;; +- "contrib/gen_cscope" ) CONFIG_FILES="$CONFIG_FILES contrib/gen_cscope" ;; +- "contrib/batch_build" ) CONFIG_FILES="$CONFIG_FILES contrib/batch_build" ;; +- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; +- "etc/Makefile" ) CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; +- "rpm/Makefile" ) CONFIG_FILES="$CONFIG_FILES rpm/Makefile" ;; +- "rpm/specfile" ) CONFIG_FILES="$CONFIG_FILES rpm/specfile" ;; +- "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; +- "include/blcr_common.h" ) CONFIG_FILES="$CONFIG_FILES include/blcr_common.h" ;; +- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; +- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; +- "blcr_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS blcr_config.h" ;; +- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-echo "$as_me: error: invalid argument: $ac_config_target" >&2;} +- { (exit 1); exit 1; }; };; +- esac +-done ++ case $ac_config_target in ++ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; ++ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; ++ "cr_module/Makefile") CONFIG_FILES="$CONFIG_FILES cr_module/Makefile" ;; ++ "cr_module/kbuild/Makefile") CONFIG_FILES="$CONFIG_FILES cr_module/kbuild/Makefile" ;; ++ "vmadump4/Makefile") CONFIG_FILES="$CONFIG_FILES vmadump4/Makefile" ;; ++ "include/blcr_imports.h") CONFIG_FILES="$CONFIG_FILES include/blcr_imports.h" ;; ++ "blcr_imports/imports.c") CONFIG_FILES="$CONFIG_FILES blcr_imports/imports.c" ;; ++ "blcr_imports/Makefile") CONFIG_FILES="$CONFIG_FILES blcr_imports/Makefile" ;; ++ "blcr_imports/kbuild/Makefile") CONFIG_FILES="$CONFIG_FILES blcr_imports/kbuild/Makefile" ;; ++ "config/kbuild.mak") CONFIG_FILES="$CONFIG_FILES config/kbuild.mak" ;; ++ "util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;; ++ "util/cr_checkpoint/Makefile") CONFIG_FILES="$CONFIG_FILES util/cr_checkpoint/Makefile" ;; ++ "util/cr_restart/Makefile") CONFIG_FILES="$CONFIG_FILES util/cr_restart/Makefile" ;; ++ "util/cr_run/Makefile") CONFIG_FILES="$CONFIG_FILES util/cr_run/Makefile" ;; ++ "util/cr_info/Makefile") CONFIG_FILES="$CONFIG_FILES util/cr_info/Makefile" ;; ++ "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; ++ "libcr/Makefile") CONFIG_FILES="$CONFIG_FILES libcr/Makefile" ;; ++ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; ++ "tests/shellinit") CONFIG_FILES="$CONFIG_FILES tests/shellinit" ;; ++ "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; ++ "examples/counting/Makefile") CONFIG_FILES="$CONFIG_FILES examples/counting/Makefile" ;; ++ "examples/pthread_counting/Makefile") CONFIG_FILES="$CONFIG_FILES examples/pthread_counting/Makefile" ;; ++ "examples/pthread_misc/Makefile") CONFIG_FILES="$CONFIG_FILES examples/pthread_misc/Makefile" ;; ++ "examples/file_counting/Makefile") CONFIG_FILES="$CONFIG_FILES examples/file_counting/Makefile" ;; ++ "examples/io_bench/Makefile") CONFIG_FILES="$CONFIG_FILES examples/io_bench/Makefile" ;; ++ "examples/pipe_counting/Makefile") CONFIG_FILES="$CONFIG_FILES examples/pipe_counting/Makefile" ;; ++ "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; ++ "contrib/cr_insmod") CONFIG_FILES="$CONFIG_FILES contrib/cr_insmod" ;; ++ "contrib/gen_cscope") CONFIG_FILES="$CONFIG_FILES contrib/gen_cscope" ;; ++ "contrib/batch_build") CONFIG_FILES="$CONFIG_FILES contrib/batch_build" ;; ++ "blcr_config.h") CONFIG_HEADERS="$CONFIG_HEADERS blcr_config.h" ;; ++ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; ++ "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; ++ "rpm/Makefile") CONFIG_FILES="$CONFIG_FILES rpm/Makefile" ;; ++ "rpm/specfile") CONFIG_FILES="$CONFIG_FILES rpm/specfile" ;; ++ "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; ++ "include/blcr_common.h") CONFIG_FILES="$CONFIG_FILES include/blcr_common.h" ;; ++ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; ++ ++ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; ++ esac ++done ++ + + # If the user did not use the arguments to specify the items to instantiate, + # then the envvar interface is used. Set only those that are not. +@@ -54269,946 +40782,1525 @@ + fi + + # Have a temporary directory for convenience. Make it in the build tree +-# simply because there is no reason to put it here, and in addition, ++# simply because there is no reason against having it here, and in addition, + # creating and moving files from /tmp can sometimes cause problems. +-# Create a temporary directory, and hook for its removal unless debugging. ++# Hook for its removal unless debugging. ++# Note that there is a small window in which the directory will not be cleaned: ++# after its creation but before its name has been assigned to `$tmp'. + $debug || + { +- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 +- trap '{ (exit 1); exit 1; }' 1 2 13 15 +-} +- ++ tmp= ++ trap 'exit_status=$? ++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++' 0 ++ trap 'as_fn_exit 1' 1 2 13 15 ++} + # Create a (secure) tmp directory for tmp files. + + { +- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && ++ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" + } || + { +- tmp=./confstat$$-$RANDOM +- (umask 077 && mkdir $tmp) +-} || +-{ +- echo "$me: cannot create a temporary directory in ." >&2 +- { (exit 1); exit 1; } +-} +- +-_ACEOF +- +-cat >>$CONFIG_STATUS <<_ACEOF +- +-# +-# CONFIG_FILES section. +-# +- +-# No need to generate the scripts if there are no CONFIG_FILES. +-# This happens for instance when ./config.status config.h +-if test -n "\$CONFIG_FILES"; then +- # Protect against being on the right side of a sed subst in config.status. +- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; +- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF +-s,@SHELL@,$SHELL,;t t +-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +-s,@exec_prefix@,$exec_prefix,;t t +-s,@prefix@,$prefix,;t t +-s,@program_transform_name@,$program_transform_name,;t t +-s,@bindir@,$bindir,;t t +-s,@sbindir@,$sbindir,;t t +-s,@libexecdir@,$libexecdir,;t t +-s,@datadir@,$datadir,;t t +-s,@sysconfdir@,$sysconfdir,;t t +-s,@sharedstatedir@,$sharedstatedir,;t t +-s,@localstatedir@,$localstatedir,;t t +-s,@libdir@,$libdir,;t t +-s,@includedir@,$includedir,;t t +-s,@oldincludedir@,$oldincludedir,;t t +-s,@infodir@,$infodir,;t t +-s,@mandir@,$mandir,;t t +-s,@build_alias@,$build_alias,;t t +-s,@host_alias@,$host_alias,;t t +-s,@target_alias@,$target_alias,;t t +-s,@DEFS@,$DEFS,;t t +-s,@ECHO_C@,$ECHO_C,;t t +-s,@ECHO_N@,$ECHO_N,;t t +-s,@ECHO_T@,$ECHO_T,;t t +-s,@LIBS@,$LIBS,;t t +-s,@CR_RELEASE_MAJOR@,$CR_RELEASE_MAJOR,;t t +-s,@CR_RELEASE_MINOR@,$CR_RELEASE_MINOR,;t t +-s,@CR_RELEASE_PATCH@,$CR_RELEASE_PATCH,;t t +-s,@CR_RELEASE_VERSION@,$CR_RELEASE_VERSION,;t t +-s,@LIBCR_MAJOR@,$LIBCR_MAJOR,;t t +-s,@LIBCR_MINOR@,$LIBCR_MINOR,;t t +-s,@LIBCR_PATCH@,$LIBCR_PATCH,;t t +-s,@LIBCR_VERSION@,$LIBCR_VERSION,;t t +-s,@CR_MODULE_MAJOR@,$CR_MODULE_MAJOR,;t t +-s,@CR_MODULE_MINOR@,$CR_MODULE_MINOR,;t t +-s,@CR_MODULE_PATCH@,$CR_MODULE_PATCH,;t t +-s,@CR_MODULE_VERSION@,$CR_MODULE_VERSION,;t t +-s,@LIBTOOL_INTERFACE@,$LIBTOOL_INTERFACE,;t t +-s,@LIBTOOL_AGE@,$LIBTOOL_AGE,;t t +-s,@LIBTOOL_REVISION@,$LIBTOOL_REVISION,;t t +-s,@CONFIGURE_ARGS@,$CONFIGURE_ARGS,;t t +-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +-s,@INSTALL_DATA@,$INSTALL_DATA,;t t +-s,@CYGPATH_W@,$CYGPATH_W,;t t +-s,@PACKAGE@,$PACKAGE,;t t +-s,@VERSION@,$VERSION,;t t +-s,@ACLOCAL@,$ACLOCAL,;t t +-s,@AUTOCONF@,$AUTOCONF,;t t +-s,@AUTOMAKE@,$AUTOMAKE,;t t +-s,@AUTOHEADER@,$AUTOHEADER,;t t +-s,@MAKEINFO@,$MAKEINFO,;t t +-s,@AMTAR@,$AMTAR,;t t +-s,@install_sh@,$install_sh,;t t +-s,@STRIP@,$STRIP,;t t +-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t +-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t +-s,@mkdir_p@,$mkdir_p,;t t +-s,@AWK@,$AWK,;t t +-s,@SET_MAKE@,$SET_MAKE,;t t +-s,@am__leading_dot@,$am__leading_dot,;t t +-s,@PWD_PROG@,$PWD_PROG,;t t +-s,@TOP_BUILDDIR@,$TOP_BUILDDIR,;t t +-s,@TOP_SRCDIR@,$TOP_SRCDIR,;t t +-s,@build@,$build,;t t +-s,@build_cpu@,$build_cpu,;t t +-s,@build_vendor@,$build_vendor,;t t +-s,@build_os@,$build_os,;t t +-s,@host@,$host,;t t +-s,@host_cpu@,$host_cpu,;t t +-s,@host_vendor@,$host_vendor,;t t +-s,@host_os@,$host_os,;t t +-s,@CR_ARCH@,$CR_ARCH,;t t +-s,@CR_CPU@,$CR_CPU,;t t +-s,@CRI_DEBUG_TRUE@,$CRI_DEBUG_TRUE,;t t +-s,@CRI_DEBUG_FALSE@,$CRI_DEBUG_FALSE,;t t +-s,@CR_NDEBUG@,$CR_NDEBUG,;t t +-s,@LIBCR_TRACING_TRUE@,$LIBCR_TRACING_TRUE,;t t +-s,@LIBCR_TRACING_FALSE@,$LIBCR_TRACING_FALSE,;t t +-s,@CR_KERNEL_TRACING_TRUE@,$CR_KERNEL_TRACING_TRUE,;t t +-s,@CR_KERNEL_TRACING_FALSE@,$CR_KERNEL_TRACING_FALSE,;t t +-s,@CR_BUILD_ETC_TRUE@,$CR_BUILD_ETC_TRUE,;t t +-s,@CR_BUILD_ETC_FALSE@,$CR_BUILD_ETC_FALSE,;t t +-s,@CR_INSTALLED_LIBCR_TRUE@,$CR_INSTALLED_LIBCR_TRUE,;t t +-s,@CR_INSTALLED_LIBCR_FALSE@,$CR_INSTALLED_LIBCR_FALSE,;t t +-s,@CR_INSTALLED_UTIL_TRUE@,$CR_INSTALLED_UTIL_TRUE,;t t +-s,@CR_INSTALLED_UTIL_FALSE@,$CR_INSTALLED_UTIL_FALSE,;t t +-s,@CR_BUILD_TESTSUITE_TRUE@,$CR_BUILD_TESTSUITE_TRUE,;t t +-s,@CR_BUILD_TESTSUITE_FALSE@,$CR_BUILD_TESTSUITE_FALSE,;t t +-s,@PERL@,$PERL,;t t +-s,@MAKE@,$MAKE,;t t +-s,@RPMBUILD@,$RPMBUILD,;t t +-s,@KCC@,$KCC,;t t +-s,@RANLIB@,$RANLIB,;t t +-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t +-s,@LN_S@,$LN_S,;t t +-s,@CC@,$CC,;t t +-s,@CFLAGS@,$CFLAGS,;t t +-s,@LDFLAGS@,$LDFLAGS,;t t +-s,@CPPFLAGS@,$CPPFLAGS,;t t +-s,@ac_ct_CC@,$ac_ct_CC,;t t +-s,@EXEEXT@,$EXEEXT,;t t +-s,@OBJEXT@,$OBJEXT,;t t +-s,@DEPDIR@,$DEPDIR,;t t +-s,@am__include@,$am__include,;t t +-s,@am__quote@,$am__quote,;t t +-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t +-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t +-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t +-s,@CCDEPMODE@,$CCDEPMODE,;t t +-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t +-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t +-s,@EGREP@,$EGREP,;t t +-s,@ECHO@,$ECHO,;t t +-s,@AR@,$AR,;t t +-s,@ac_ct_AR@,$ac_ct_AR,;t t +-s,@CPP@,$CPP,;t t +-s,@CXX@,$CXX,;t t +-s,@CXXFLAGS@,$CXXFLAGS,;t t +-s,@ac_ct_CXX@,$ac_ct_CXX,;t t +-s,@CXXDEPMODE@,$CXXDEPMODE,;t t +-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t +-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t +-s,@CXXCPP@,$CXXCPP,;t t +-s,@F77@,$F77,;t t +-s,@FFLAGS@,$FFLAGS,;t t +-s,@ac_ct_F77@,$ac_ct_F77,;t t +-s,@LIBTOOL@,$LIBTOOL,;t t +-s,@CR_ENABLE_STATIC_TRUE@,$CR_ENABLE_STATIC_TRUE,;t t +-s,@CR_ENABLE_STATIC_FALSE@,$CR_ENABLE_STATIC_FALSE,;t t +-s,@CR_ENABLE_SHARED_TRUE@,$CR_ENABLE_SHARED_TRUE,;t t +-s,@CR_ENABLE_SHARED_FALSE@,$CR_ENABLE_SHARED_FALSE,;t t +-s,@HAVE_RPMBUILD_TRUE@,$HAVE_RPMBUILD_TRUE,;t t +-s,@HAVE_RPMBUILD_FALSE@,$HAVE_RPMBUILD_FALSE,;t t +-s,@CR_LIBCR_CFLAGS@,$CR_LIBCR_CFLAGS,;t t +-s,@CR_CLIENT_LDADD@,$CR_CLIENT_LDADD,;t t +-s,@CR_FTB_INCLUDES@,$CR_FTB_INCLUDES,;t t +-s,@CR_FTB_LDFLAGS@,$CR_FTB_LDFLAGS,;t t +-s,@CR_FTB_LDADD@,$CR_FTB_LDADD,;t t +-s,@CR_SIGNUM@,$CR_SIGNUM,;t t +-s,@CR_LIBARCH@,$CR_LIBARCH,;t t +-s,@CR_BUILD_LIBCR32_TRUE@,$CR_BUILD_LIBCR32_TRUE,;t t +-s,@CR_BUILD_LIBCR32_FALSE@,$CR_BUILD_LIBCR32_FALSE,;t t +-s,@NM@,$NM,;t t +-s,@LINUX_SRC@,$LINUX_SRC,;t t +-s,@LINUX_OBJ@,$LINUX_OBJ,;t t +-s,@LINUX_VER@,$LINUX_VER,;t t +-s,@CR_KERNEL@,$CR_KERNEL,;t t +-s,@CR_KERNEL_BASE@,$CR_KERNEL_BASE,;t t +-s,@CR_MODULE_DIR@,$CR_MODULE_DIR,;t t +-s,@KBUILD_MAKE_ARGS@,$KBUILD_MAKE_ARGS,;t t +-s,@LINUX_SYMTAB_FILE@,$LINUX_SYMTAB_FILE,;t t +-s,@LINUX_SYMTAB_CMD@,$LINUX_SYMTAB_CMD,;t t +-s,@LINUX_SYMTAB_CONF@,$LINUX_SYMTAB_CONF,;t t +-s,@CR_HAVE_SYSTEM_MAP_TRUE@,$CR_HAVE_SYSTEM_MAP_TRUE,;t t +-s,@CR_HAVE_SYSTEM_MAP_FALSE@,$CR_HAVE_SYSTEM_MAP_FALSE,;t t +-s,@CR_BUILD_MAN_TRUE@,$CR_BUILD_MAN_TRUE,;t t +-s,@CR_BUILD_MAN_FALSE@,$CR_BUILD_MAN_FALSE,;t t +-s,@CR_HAVE_FTB_TRUE@,$CR_HAVE_FTB_TRUE,;t t +-s,@CR_HAVE_FTB_FALSE@,$CR_HAVE_FTB_FALSE,;t t +-s,@CR_HAVE_CXX_TRUE@,$CR_HAVE_CXX_TRUE,;t t +-s,@CR_HAVE_CXX_FALSE@,$CR_HAVE_CXX_FALSE,;t t +-s,@GMAKE_IFEQ@,$GMAKE_IFEQ,;t t +-s,@GMAKE_IFNEQ@,$GMAKE_IFNEQ,;t t +-s,@GMAKE_ELSE@,$GMAKE_ELSE,;t t +-s,@GMAKE_ENDIF@,$GMAKE_ENDIF,;t t +-s,@KBUILD_MAK@,$KBUILD_MAK,;t t +-s,@BUILD_CR_INFO_TRUE@,$BUILD_CR_INFO_TRUE,;t t +-s,@BUILD_CR_INFO_FALSE@,$BUILD_CR_INFO_FALSE,;t t +-s,@BUILD_VMADLIB_TRUE@,$BUILD_VMADLIB_TRUE,;t t +-s,@BUILD_VMADLIB_FALSE@,$BUILD_VMADLIB_FALSE,;t t +-s,@CR_BUILD_MODULES_TRUE@,$CR_BUILD_MODULES_TRUE,;t t +-s,@CR_BUILD_MODULES_FALSE@,$CR_BUILD_MODULES_FALSE,;t t +-s,@CR_BUILD_UTIL_TRUE@,$CR_BUILD_UTIL_TRUE,;t t +-s,@CR_BUILD_UTIL_FALSE@,$CR_BUILD_UTIL_FALSE,;t t +-s,@CR_BUILD_LIBCR_TRUE@,$CR_BUILD_LIBCR_TRUE,;t t +-s,@CR_BUILD_LIBCR_FALSE@,$CR_BUILD_LIBCR_FALSE,;t t +-s,@CR_BUILD_INCLUDE_TRUE@,$CR_BUILD_INCLUDE_TRUE,;t t +-s,@CR_BUILD_INCLUDE_FALSE@,$CR_BUILD_INCLUDE_FALSE,;t t +-s,@CR_BUILD_TESTS_TRUE@,$CR_BUILD_TESTS_TRUE,;t t +-s,@CR_BUILD_TESTS_FALSE@,$CR_BUILD_TESTS_FALSE,;t t +-s,@CR_BUILD_EXAMPLES_TRUE@,$CR_BUILD_EXAMPLES_TRUE,;t t +-s,@CR_BUILD_EXAMPLES_FALSE@,$CR_BUILD_EXAMPLES_FALSE,;t t +-s,@CR_BUILD_CONTRIB_TRUE@,$CR_BUILD_CONTRIB_TRUE,;t t +-s,@CR_BUILD_CONTRIB_FALSE@,$CR_BUILD_CONTRIB_FALSE,;t t +-s,@LIBOBJS@,$LIBOBJS,;t t +-s,@LTLIBOBJS@,$LTLIBOBJS,;t t +-/@CR_KSYM_IMPORT_DECLS@/r $CR_KSYM_IMPORT_DECLS +-s,@CR_KSYM_IMPORT_DECLS@,,;t t +-/@CR_KSYM_IMPORT_CALLS@/r $CR_KSYM_IMPORT_CALLS +-s,@CR_KSYM_IMPORT_CALLS@,,;t t +-CEOF +- +-_ACEOF +- +- cat >>$CONFIG_STATUS <<\_ACEOF +- # Split the substitutions into bite-sized pieces for seds with +- # small command number limits, like on Digital OSF/1 and HP-UX. +- ac_max_sed_lines=48 +- ac_sed_frag=1 # Number of current file. +- ac_beg=1 # First line for current file. +- ac_end=$ac_max_sed_lines # Line after last line for current file. +- ac_more_lines=: +- ac_sed_cmds= +- while $ac_more_lines; do +- if test $ac_beg -gt 1; then +- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag +- else +- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag +- fi +- if test ! -s $tmp/subs.frag; then +- ac_more_lines=false +- else +- # The purpose of the label and of the branching condition is to +- # speed up the sed processing (if there are no `@' at all, there +- # is no need to browse any of the substitutions). +- # These are the two extra sed commands mentioned above. +- (echo ':t +- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed +- if test -z "$ac_sed_cmds"; then +- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" +- else +- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" +- fi +- ac_sed_frag=`expr $ac_sed_frag + 1` +- ac_beg=$ac_end +- ac_end=`expr $ac_end + $ac_max_sed_lines` +- fi +- done +- if test -z "$ac_sed_cmds"; then +- ac_sed_cmds=cat +- fi ++ tmp=./conf$$-$RANDOM ++ (umask 077 && mkdir "$tmp") ++} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 ++ ++# Set up the scripts for CONFIG_FILES section. ++# No need to generate them if there are no CONFIG_FILES. ++# This happens for instance with `./config.status config.h'. ++if test -n "$CONFIG_FILES"; then ++ ++if $AWK 'BEGIN { getline <"/dev/null" }' /dev/null; then ++ ac_cs_awk_getline=: ++ ac_cs_awk_pipe_init= ++ ac_cs_awk_read_file=' ++ while ((getline aline < (F[key])) > 0) ++ print(aline) ++ close(F[key])' ++ ac_cs_awk_pipe_fini= ++else ++ ac_cs_awk_getline=false ++ ac_cs_awk_pipe_init="print \"cat <<'|#_!!_#|' &&\"" ++ ac_cs_awk_read_file=' ++ print "|#_!!_#|" ++ print "cat " F[key] " &&" ++ '$ac_cs_awk_pipe_init ++ # The final `:' finishes the AND list. ++ ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }' ++fi ++ac_cr=`echo X | tr X '\015'` ++# On cygwin, bash can eat \r inside `` if the user requested igncr. ++# But we know of no other shell where ac_cr would be empty at this ++# point, so we can use a bashism as a fallback. ++if test "x$ac_cr" = x; then ++ eval ac_cr=\$\'\\r\' ++fi ++ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` ++if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ++ ac_cs_awk_cr='\r' ++else ++ ac_cs_awk_cr=$ac_cr ++fi ++ ++echo 'BEGIN {' >"$tmp/subs1.awk" && ++_ACEOF ++ ++# Create commands to substitute file output variables. ++{ ++ echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" && ++ echo 'cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&' && ++ echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' && ++ echo "_ACAWK" && ++ echo "_ACEOF" ++} >conf$$files.sh && ++. ./conf$$files.sh || ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++rm -f conf$$files.sh ++ ++{ ++ echo "cat >conf$$subs.awk <<_ACEOF" && ++ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && ++ echo "_ACEOF" ++} >conf$$subs.sh || ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ . ./conf$$subs.sh || ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ ++ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` ++ if test $ac_delim_n = $ac_delim_num; then ++ break ++ elif $ac_last_try; then ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++rm -f conf$$subs.sh ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>"\$tmp/subs1.awk" <<\\_ACAWK && ++_ACEOF ++sed -n ' ++h ++s/^/S["/; s/!.*/"]=/ ++p ++g ++s/^[^!]*!// ++:repl ++t repl ++s/'"$ac_delim"'$// ++t delim ++:nl ++h ++s/\(.\{148\}\)..*/\1/ ++t more1 ++s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ ++p ++n ++b repl ++:more1 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t nl ++:delim ++h ++s/\(.\{148\}\)..*/\1/ ++t more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"/ ++p ++b ++:more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t delim ++' >$CONFIG_STATUS || ac_write_fail=1 ++rm -f conf$$subs.awk ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++_ACAWK ++cat >>"\$tmp/subs1.awk" <<_ACAWK && ++ for (key in S) S_is_set[key] = 1 ++ FS = "" ++ \$ac_cs_awk_pipe_init ++} ++{ ++ line = $ 0 ++ nfields = split(line, field, "@") ++ substed = 0 ++ len = length(field[1]) ++ for (i = 2; i < nfields; i++) { ++ key = field[i] ++ keylen = length(key) ++ if (S_is_set[key]) { ++ value = S[key] ++ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) ++ len += length(value) + length(field[++i]) ++ substed = 1 ++ } else ++ len += 1 + keylen ++ } ++ if (nfields == 3 && !substed) { ++ key = field[2] ++ if (F[key] != "" && line ~ /^[ ]*@.*@[ ]*$/) { ++ \$ac_cs_awk_read_file ++ next ++ } ++ } ++ print line ++} ++\$ac_cs_awk_pipe_fini ++_ACAWK ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then ++ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" ++else ++ cat ++fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ ++ || as_fn_error "could not setup config files machinery" "$LINENO" 5 ++_ACEOF ++ ++# VPATH may cause trouble with some makes, so we remove $(srcdir), ++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# trailing colons and then remove the whole line if VPATH becomes empty ++# (actually we leave an empty line to preserve line numbers). ++if test "x$srcdir" = x.; then ++ ac_vpsub='/^[ ]*VPATH[ ]*=/{ ++s/:*\$(srcdir):*/:/ ++s/:*\${srcdir}:*/:/ ++s/:*@srcdir@:*/:/ ++s/^\([^=]*=[ ]*\):*/\1/ ++s/:*$// ++s/^[^=]*=[ ]*$// ++}' ++fi ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + fi # test -n "$CONFIG_FILES" + +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF +-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +- case $ac_file in +- - | *:- | *:-:* ) # input from stdin +- cat >$tmp/stdin +- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- * ) ac_file_in=$ac_file.in ;; +- esac +- +- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. +- ac_dir=`(dirname "$ac_file") 2>/dev/null || ++# Set up the scripts for CONFIG_HEADERS section. ++# No need to generate them if there are no CONFIG_HEADERS. ++# This happens for instance with `./config.status Makefile'. ++if test -n "$CONFIG_HEADERS"; then ++cat >"$tmp/defines.awk" <<\_ACAWK || ++BEGIN { ++_ACEOF ++ ++# Transform confdefs.h into an awk script `defines.awk', embedded as ++# here-document in config.status, that substitutes the proper values into ++# config.h.in to produce config.h. ++ ++# Create a delimiter string that does not exist in confdefs.h, to ease ++# handling of long lines. ++ac_delim='%!_!# ' ++for ac_last_try in false false :; do ++ ac_t=`sed -n "/$ac_delim/p" confdefs.h` ++ if test -z "$ac_t"; then ++ break ++ elif $ac_last_try; then ++ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++# For the awk script, D is an array of macro values keyed by name, ++# likewise P contains macro parameters if any. Preserve backslash ++# newline sequences. ++ ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++sed -n ' ++s/.\{148\}/&'"$ac_delim"'/g ++t rset ++:rset ++s/^[ ]*#[ ]*define[ ][ ]*/ / ++t def ++d ++:def ++s/\\$// ++t bsnl ++s/["\\]/\\&/g ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ ++D["\1"]=" \3"/p ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p ++d ++:bsnl ++s/["\\]/\\&/g ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ ++D["\1"]=" \3\\\\\\n"\\/p ++t cont ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p ++t cont ++d ++:cont ++n ++s/.\{148\}/&'"$ac_delim"'/g ++t clear ++:clear ++s/\\$// ++t bsnlc ++s/["\\]/\\&/g; s/^/"/; s/$/"/p ++d ++:bsnlc ++s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p ++b cont ++' >$CONFIG_STATUS || ac_write_fail=1 ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ for (key in D) D_is_set[key] = 1 ++ FS = "" ++} ++/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { ++ line = \$ 0 ++ split(line, arg, " ") ++ if (arg[1] == "#") { ++ defundef = arg[2] ++ mac1 = arg[3] ++ } else { ++ defundef = substr(arg[1], 2) ++ mac1 = arg[2] ++ } ++ split(mac1, mac2, "(") #) ++ macro = mac2[1] ++ prefix = substr(line, 1, index(line, defundef) - 1) ++ if (D_is_set[macro]) { ++ # Preserve the white space surrounding the "#". ++ print prefix "define", macro P[macro] D[macro] ++ next ++ } else { ++ # Replace #undef with comments. This is necessary, for example, ++ # in the case of _POSIX_SOURCE, which is predefined and required ++ # on some systems where configure will not decide to define it. ++ if (defundef == "undef") { ++ print "/*", prefix defundef, macro, "*/" ++ next ++ } ++ } ++} ++{ print } ++_ACAWK ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++ as_fn_error "could not setup config headers machinery" "$LINENO" 5 ++fi # test -n "$CONFIG_HEADERS" ++ ++ ++eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" ++shift ++for ac_tag ++do ++ case $ac_tag in ++ :[FHLC]) ac_mode=$ac_tag; continue;; ++ esac ++ case $ac_mode$ac_tag in ++ :[FHL]*:*);; ++ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; ++ :[FH]-) ac_tag=-:-;; ++ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; ++ esac ++ ac_save_IFS=$IFS ++ IFS=: ++ set x $ac_tag ++ IFS=$ac_save_IFS ++ shift ++ ac_file=$1 ++ shift ++ ++ case $ac_mode in ++ :L) ac_source=$1;; ++ :[FH]) ++ ac_file_inputs= ++ for ac_f ++ do ++ case $ac_f in ++ -) ac_f="$tmp/stdin";; ++ *) # Look for the file first in the build tree, then in the source tree ++ # (if the path is not absolute). The absolute path cannot be DOS-style, ++ # because $ac_f cannot contain `:'. ++ test -f "$ac_f" || ++ case $ac_f in ++ [\\/$]*) false;; ++ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; ++ esac || ++ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; ++ esac ++ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac ++ as_fn_append ac_file_inputs " '$ac_f'" ++ done ++ ++ # Let's still pretend it is `configure' which instantiates (i.e., don't ++ # use $as_me), people would be surprised to read: ++ # /* config.h. Generated by config.status. */ ++ configure_input='Generated from '` ++ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' ++ `' by configure.' ++ if test x"$ac_file" != x-; then ++ configure_input="$ac_file. $configure_input" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 ++$as_echo "$as_me: creating $ac_file" >&6;} ++ fi ++ # Neutralize special characters interpreted by sed in replacement strings. ++ case $configure_input in #( ++ *\&* | *\|* | *\\* ) ++ ac_sed_conf_input=`$as_echo "$configure_input" | ++ sed 's/[\\\\&|]/\\\\&/g'`;; #( ++ *) ac_sed_conf_input=$configure_input;; ++ esac ++ ++ case $ac_tag in ++ *:-:* | *:-) cat >"$tmp/stdin" \ ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; ++ esac ++ ;; ++ esac ++ ++ ac_dir=`$as_dirname -- "$ac_file" || + $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ +- X"$ac_file" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p "$ac_dir" +- else +- as_dir="$ac_dir" +- as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} +- { (exit 1); exit 1; }; }; } +- ++ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$ac_file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +-if test "$ac_dir" != .; then +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A "../" for each directory in $ac_dir_suffix. +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +-else +- ac_dir_suffix= ac_top_builddir= +-fi ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix + + case $srcdir in +- .) # No --srcdir option. We are building in place. ++ .) # We are building in place. + ac_srcdir=. +- if test -z "$ac_top_builddir"; then +- ac_top_srcdir=. +- else +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +- fi ;; +- [\\/]* | ?:[\\/]* ) # Absolute path. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir ;; +- *) # Relative path. +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_builddir$srcdir ;; +-esac +- +-# Do not use `cd foo && pwd` to compute absolute paths, because +-# the directories may not exist. +-case `pwd` in +-.) ac_abs_builddir="$ac_dir";; +-*) +- case "$ac_dir" in +- .) ac_abs_builddir=`pwd`;; +- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +- *) ac_abs_builddir=`pwd`/"$ac_dir";; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_builddir=${ac_top_builddir}.;; +-*) +- case ${ac_top_builddir}. in +- .) ac_abs_top_builddir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_srcdir=$ac_srcdir;; +-*) +- case $ac_srcdir in +- .) ac_abs_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_srcdir=$ac_top_srcdir;; +-*) +- case $ac_top_srcdir in +- .) ac_abs_top_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +- esac;; +-esac +- ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; ++esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ++ ++ ++ case $ac_mode in ++ :F) ++ # ++ # CONFIG_FILE ++ # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; +- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; +- esac +- +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" +- fi +- # Let's still pretend it is `configure' which instantiates (i.e., don't +- # use $as_me), people would be surprised to read: +- # /* config.h. Generated by config.status. */ +- if test x"$ac_file" = x-; then +- configure_input= +- else +- configure_input="$ac_file. " +- fi +- configure_input=$configure_input"Generated from `echo $ac_file_in | +- sed 's,.*/,,'` by configure." +- +- # First look for the input files in the build tree, otherwise in the +- # src tree. +- ac_file_inputs=`IFS=: +- for f in $ac_file_in; do +- case $f in +- -) echo $tmp/stdin ;; +- [\\/$]*) +- # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- echo "$f";; +- *) # Relative +- if test -f "$f"; then +- # Build tree +- echo "$f" +- elif test -f "$srcdir/$f"; then +- # Source tree +- echo "$srcdir/$f" +- else +- # /dev/null tree +- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- fi;; +- esac +- done` || { (exit 1); exit 1; } +-_ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF +- sed "$ac_vpsub ++ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; ++ esac ++ ac_MKDIR_P=$MKDIR_P ++ case $MKDIR_P in ++ [\\/$]* | ?:[\\/]* ) ;; ++ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; ++ esac ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# If the template does not know about datarootdir, expand it. ++# FIXME: This hack should be removed a few years after 2.60. ++ac_datarootdir_hack=; ac_datarootdir_seen= ++ac_sed_dataroot=' ++/datarootdir/ { ++ p ++ q ++} ++/@datadir@/p ++/@docdir@/p ++/@infodir@/p ++/@localedir@/p ++/@mandir@/p' ++case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in ++*datarootdir*) ac_datarootdir_seen=yes;; ++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ ac_datarootdir_hack=' ++ s&@datadir@&$datadir&g ++ s&@docdir@&$docdir&g ++ s&@infodir@&$infodir&g ++ s&@localedir@&$localedir&g ++ s&@mandir@&$mandir&g ++ s&\\\${datarootdir}&$datarootdir&g' ;; ++esac ++_ACEOF ++ ++# Neutralize VPATH when `$srcdir' = `.'. ++# Shell code in configure.ac might set extrasub. ++# FIXME: do we really want to maintain this feature? ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_sed_extra="$ac_vpsub + $extrasub + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + :t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s,@configure_input@,$configure_input,;t t +-s,@srcdir@,$ac_srcdir,;t t +-s,@abs_srcdir@,$ac_abs_srcdir,;t t +-s,@top_srcdir@,$ac_top_srcdir,;t t +-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +-s,@builddir@,$ac_builddir,;t t +-s,@abs_builddir@,$ac_abs_builddir,;t t +-s,@top_builddir@,$ac_top_builddir,;t t +-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t +-s,@INSTALL@,$ac_INSTALL,;t t +-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out +- rm -f $tmp/stdin ++s|@configure_input@|$ac_sed_conf_input|;t t ++s&@top_builddir@&$ac_top_builddir_sub&;t t ++s&@top_build_prefix@&$ac_top_build_prefix&;t t ++s&@srcdir@&$ac_srcdir&;t t ++s&@abs_srcdir@&$ac_abs_srcdir&;t t ++s&@top_srcdir@&$ac_top_srcdir&;t t ++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t ++s&@builddir@&$ac_builddir&;t t ++s&@abs_builddir@&$ac_abs_builddir&;t t ++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t ++s&@INSTALL@&$ac_INSTALL&;t t ++s&@MKDIR_P@&$ac_MKDIR_P&;t t ++$ac_datarootdir_hack ++" ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | ++if $ac_cs_awk_getline; then ++ $AWK -f "$tmp/subs.awk" ++else ++ $AWK -f "$tmp/subs.awk" | $SHELL ++fi >$tmp/out \ ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ ++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && ++ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined." >&5 ++$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined." >&2;} ++ ++ rm -f "$tmp/stdin" ++ case $ac_file in ++ -) cat "$tmp/out" && rm -f "$tmp/out";; ++ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; ++ esac \ ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ ;; ++ :H) ++ # ++ # CONFIG_HEADER ++ # + if test x"$ac_file" != x-; then +- mv $tmp/out $ac_file +- else +- cat $tmp/out +- rm -f $tmp/out +- fi +- +- # Run the commands associated with the file. +- case $ac_file in +- tests/shellinit ) chmod +x tests/shellinit ;; +- contrib/cr_insmod ) chmod +x contrib/cr_insmod ;; +- contrib/gen_cscope ) chmod +x contrib/gen_cscope ;; +- contrib/batch_build ) chmod +x contrib/batch_build ;; +- esac +-done +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF +- +-# +-# CONFIG_HEADER section. +-# +- +-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +-# NAME is the cpp macro being defined and VALUE is the value it is being given. +-# +-# ac_d sets the value in "#define NAME VALUE" lines. +-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +-ac_dB='[ ].*$,\1#\2' +-ac_dC=' ' +-ac_dD=',;t' +-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +-ac_uB='$,\1#\2define\3' +-ac_uC=' ' +-ac_uD=',;t' +- +-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +- case $ac_file in +- - | *:- | *:-:* ) # input from stdin +- cat >$tmp/stdin +- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; +- * ) ac_file_in=$ac_file.in ;; +- esac +- +- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- +- # First look for the input files in the build tree, otherwise in the +- # src tree. +- ac_file_inputs=`IFS=: +- for f in $ac_file_in; do +- case $f in +- -) echo $tmp/stdin ;; +- [\\/$]*) +- # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- # Do quote $f, to prevent DOS paths from being IFS'd. +- echo "$f";; +- *) # Relative +- if test -f "$f"; then +- # Build tree +- echo "$f" +- elif test -f "$srcdir/$f"; then +- # Source tree +- echo "$srcdir/$f" +- else +- # /dev/null tree +- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +-echo "$as_me: error: cannot find input file: $f" >&2;} +- { (exit 1); exit 1; }; } +- fi;; +- esac +- done` || { (exit 1); exit 1; } +- # Remove the trailing spaces. +- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in +- +-_ACEOF +- +-# Transform confdefs.h into two sed scripts, `conftest.defines' and +-# `conftest.undefs', that substitutes the proper values into +-# config.h.in to produce config.h. The first handles `#define' +-# templates, and the second `#undef' templates. +-# And first: Protect against being on the right side of a sed subst in +-# config.status. Protect against being in an unquoted here document +-# in config.status. +-rm -f conftest.defines conftest.undefs +-# Using a here document instead of a string reduces the quoting nightmare. +-# Putting comments in sed scripts is not portable. +-# +-# `end' is used to avoid that the second main sed command (meant for +-# 0-ary CPP macros) applies to n-ary macro definitions. +-# See the Autoconf documentation for `clear'. +-cat >confdef2sed.sed <<\_ACEOF +-s/[\\&,]/\\&/g +-s,[\\$`],\\&,g +-t clear +-: clear +-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +-t end +-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +-: end +-_ACEOF +-# If some macros were called several times there might be several times +-# the same #defines, which is useless. Nevertheless, we may not want to +-# sort them, since we want the *last* AC-DEFINE to be honored. +-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines +-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs +-rm -f confdef2sed.sed +- +-# This sed command replaces #undef with comments. This is necessary, for +-# example, in the case of _POSIX_SOURCE, which is predefined and required +-# on some systems where configure will not decide to define it. +-cat >>conftest.undefs <<\_ACEOF +-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +-_ACEOF +- +-# Break up conftest.defines because some shells have a limit on the size +-# of here documents, and old seds have small limits too (100 cmds). +-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS +-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS +-echo ' :' >>$CONFIG_STATUS +-rm -f conftest.tail +-while grep . conftest.defines >/dev/null +-do +- # Write a limited-size here document to $tmp/defines.sed. +- echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS +- # Speed up: don't consider the non `#define' lines. +- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS +- # Work around the forget-to-reset-the-flag bug. +- echo 't clr' >>$CONFIG_STATUS +- echo ': clr' >>$CONFIG_STATUS +- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS +- echo 'CEOF +- sed -f $tmp/defines.sed $tmp/in >$tmp/out +- rm -f $tmp/in +- mv $tmp/out $tmp/in +-' >>$CONFIG_STATUS +- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail +- rm -f conftest.defines +- mv conftest.tail conftest.defines +-done +-rm -f conftest.defines +-echo ' fi # grep' >>$CONFIG_STATUS +-echo >>$CONFIG_STATUS +- +-# Break up conftest.undefs because some shells have a limit on the size +-# of here documents, and old seds have small limits too (100 cmds). +-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS +-rm -f conftest.tail +-while grep . conftest.undefs >/dev/null +-do +- # Write a limited-size here document to $tmp/undefs.sed. +- echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS +- # Speed up: don't consider the non `#undef' +- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS +- # Work around the forget-to-reset-the-flag bug. +- echo 't clr' >>$CONFIG_STATUS +- echo ': clr' >>$CONFIG_STATUS +- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS +- echo 'CEOF +- sed -f $tmp/undefs.sed $tmp/in >$tmp/out +- rm -f $tmp/in +- mv $tmp/out $tmp/in +-' >>$CONFIG_STATUS +- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail +- rm -f conftest.undefs +- mv conftest.tail conftest.undefs +-done +-rm -f conftest.undefs +- +-cat >>$CONFIG_STATUS <<\_ACEOF +- # Let's still pretend it is `configure' which instantiates (i.e., don't +- # use $as_me), people would be surprised to read: +- # /* config.h. Generated by config.status. */ +- if test x"$ac_file" = x-; then +- echo "/* Generated by configure. */" >$tmp/config.h +- else +- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h +- fi +- cat $tmp/in >>$tmp/config.h +- rm -f $tmp/in +- if test x"$ac_file" != x-; then +- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then +- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +-echo "$as_me: $ac_file is unchanged" >&6;} +- else +- ac_dir=`(dirname "$ac_file") 2>/dev/null || +-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$ac_file" : 'X\(//\)[^/]' \| \ +- X"$ac_file" : 'X\(//\)$' \| \ +- X"$ac_file" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p "$ac_dir" +- else +- as_dir="$ac_dir" +- as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} +- { (exit 1); exit 1; }; }; } +- +- rm -f $ac_file +- mv $tmp/config.h $ac_file +- fi +- else +- cat $tmp/config.h +- rm -f $tmp/config.h +- fi +-# Compute $ac_file's index in $config_headers. ++ { ++ $as_echo "/* $configure_input */" \ ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" ++ } >"$tmp/config.h" \ ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 ++$as_echo "$as_me: $ac_file is unchanged" >&6;} ++ else ++ rm -f "$ac_file" ++ mv "$tmp/config.h" "$ac_file" \ ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ fi ++ else ++ $as_echo "/* $configure_input */" \ ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ ++ || as_fn_error "could not create -" "$LINENO" 5 ++ fi ++# Compute "$ac_file"'s index in $config_headers. ++_am_arg="$ac_file" + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $ac_file | $ac_file:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || +-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X$ac_file : 'X\(//\)[^/]' \| \ +- X$ac_file : 'X\(//\)$' \| \ +- X$ac_file : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X$ac_file | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'`/stamp-h$_am_stamp_count +-done +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF +- +-# +-# CONFIG_COMMANDS section. +-# +-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue +- ac_dest=`echo "$ac_file" | sed 's,:.*,,'` +- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` +- ac_dir=`(dirname "$ac_dest") 2>/dev/null || +-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$ac_dest" : 'X\(//\)[^/]' \| \ +- X"$ac_dest" : 'X\(//\)$' \| \ +- X"$ac_dest" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$ac_dest" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p "$ac_dir" +- else +- as_dir="$ac_dir" +- as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} +- { (exit 1); exit 1; }; }; } +- +- ac_builddir=. +- +-if test "$ac_dir" != .; then +- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` +- # A "../" for each directory in $ac_dir_suffix. +- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +-else +- ac_dir_suffix= ac_top_builddir= +-fi +- +-case $srcdir in +- .) # No --srcdir option. We are building in place. +- ac_srcdir=. +- if test -z "$ac_top_builddir"; then +- ac_top_srcdir=. +- else +- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` +- fi ;; +- [\\/]* | ?:[\\/]* ) # Absolute path. +- ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir ;; +- *) # Relative path. +- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_builddir$srcdir ;; +-esac +- +-# Do not use `cd foo && pwd` to compute absolute paths, because +-# the directories may not exist. +-case `pwd` in +-.) ac_abs_builddir="$ac_dir";; +-*) +- case "$ac_dir" in +- .) ac_abs_builddir=`pwd`;; +- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; +- *) ac_abs_builddir=`pwd`/"$ac_dir";; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_builddir=${ac_top_builddir}.;; +-*) +- case ${ac_top_builddir}. in +- .) ac_abs_top_builddir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; +- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_srcdir=$ac_srcdir;; +-*) +- case $ac_srcdir in +- .) ac_abs_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; +- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; +- esac;; +-esac +-case $ac_abs_builddir in +-.) ac_abs_top_srcdir=$ac_top_srcdir;; +-*) +- case $ac_top_srcdir in +- .) ac_abs_top_srcdir=$ac_abs_builddir;; +- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; +- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; +- esac;; +-esac +- +- +- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +-echo "$as_me: executing $ac_dest commands" >&6;} +- case $ac_dest in +- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`(dirname "$mf") 2>/dev/null || ++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || ++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$_am_arg" : 'X\(//\)[^/]' \| \ ++ X"$_am_arg" : 'X\(//\)$' \| \ ++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$_am_arg" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'`/stamp-h$_am_stamp_count ++ ;; ++ ++ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 ++$as_echo "$as_me: executing $ac_file commands" >&6;} ++ ;; ++ esac ++ ++ ++ case $ac_file$ac_mode in ++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || { ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ +- X"$mf" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$mf" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- else +- continue +- fi +- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue +- # Extract the definition of DEP_FILES from the Makefile without +- # running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" +- # We invoke sed twice because it is the simplest approach to +- # changing $(DEPDIR) to its actual value in the expansion. +- for file in `sed -n ' +- /^DEP_FILES = .*\\\\$/ { +- s/^DEP_FILES = // +- :loop +- s/\\\\$// +- p +- n +- /\\\\$/ b loop +- p +- } +- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`(dirname "$file") 2>/dev/null || ++ X"$mf" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$mf" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`$as_dirname -- "$file" || + $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ +- X"$file" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` +- { if $as_mkdir_p; then +- mkdir -p $dirpart/$fdir +- else +- as_dir=$dirpart/$fdir +- as_dirs= +- while test ! -d "$as_dir"; do +- as_dirs="$as_dir $as_dirs" +- as_dir=`(dirname "$as_dir") 2>/dev/null || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| \ +- . : '\(.\)' 2>/dev/null || +-echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } +- /^X\(\/\/\)[^/].*/{ s//\1/; q; } +- /^X\(\/\/\)$/{ s//\1/; q; } +- /^X\(\/\).*/{ s//\1/; q; } +- s/.*/./; q'` ++ X"$file" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ as_dir=$dirpart/$fdir; as_fn_mkdir_p ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" + done +- test ! -n "$as_dirs" || mkdir $as_dirs +- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 +-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} +- { (exit 1); exit 1; }; }; } +- +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +-done ++ done ++} + ;; +- esac +-done +-_ACEOF +- +-cat >>$CONFIG_STATUS <<\_ACEOF +- +-{ (exit 0); exit 0; } +-_ACEOF +-chmod +x $CONFIG_STATUS ++ "libtool":C) ++ ++ # See if we are running on zsh, and set the options which allow our ++ # commands through without removal of \ escapes. ++ if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++ fi ++ ++ cfgfile="${ofile}T" ++ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 ++ $RM "$cfgfile" ++ ++ cat <<_LT_EOF >> "$cfgfile" ++#! $SHELL ++ ++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is part of GNU Libtool. ++# ++# GNU Libtool 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. ++# ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or ++# obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ ++ ++# The names of the tagged configurations supported by this script. ++available_tags="CXX " ++ ++# ### BEGIN LIBTOOL CONFIG ++ ++# Whether or not to build static libraries. ++build_old_libs=$enable_static ++ ++# Which release of libtool.m4 was used? ++macro_version=$macro_version ++macro_revision=$macro_revision ++ ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared ++ ++# What type of objects to build. ++pic_mode=$pic_mode ++ ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install ++ ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os ++ ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os ++ ++# A sed program that does not truncate output. ++SED=$lt_SED ++ ++# Sed that helps us avoid accidentally triggering echo(1) options like -n. ++Xsed="\$SED -e 1s/^X//" ++ ++# A grep program that handles long lines. ++GREP=$lt_GREP ++ ++# An ERE matcher. ++EGREP=$lt_EGREP ++ ++# A literal string matcher. ++FGREP=$lt_FGREP ++ ++# A BSD- or MS-compatible name lister. ++NM=$lt_NM ++ ++# Whether we need soft or hard links. ++LN_S=$lt_LN_S ++ ++# What is the maximum length of a command? ++max_cmd_len=$max_cmd_len ++ ++# Object file suffix (normally "o"). ++objext=$ac_objext ++ ++# Executable file suffix (normally ""). ++exeext=$exeext ++ ++# whether the shell understands "unset". ++lt_unset=$lt_unset ++ ++# turn spaces into newlines. ++SP2NL=$lt_lt_SP2NL ++ ++# turn newlines into spaces. ++NL2SP=$lt_lt_NL2SP ++ ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds ++ ++# An object symbol dumper. ++OBJDUMP=$lt_OBJDUMP ++ ++# Method to check whether dependent libraries are shared objects. ++deplibs_check_method=$lt_deplibs_check_method ++ ++# Command to use when deplibs_check_method == "file_magic". ++file_magic_cmd=$lt_file_magic_cmd ++ ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS ++ ++# A symbol stripping program. ++STRIP=$lt_STRIP ++ ++# Commands used to install an old-style archive. ++RANLIB=$lt_RANLIB ++old_postinstall_cmds=$lt_old_postinstall_cmds ++old_postuninstall_cmds=$lt_old_postuninstall_cmds ++ ++# A C compiler. ++LTCC=$lt_CC ++ ++# LTCC compiler flags. ++LTCFLAGS=$lt_CFLAGS ++ ++# Take the output of nm and produce a listing of raw symbols and C names. ++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++ ++# Transform the output of nm in a proper C declaration. ++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++ ++# Transform the output of nm in a C name address pair. ++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++ ++# Transform the output of nm in a C name address pair when lib prefix is needed. ++global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix ++ ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir ++ ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL ++ ++# An echo program that does not interpret backslashes. ++ECHO=$lt_ECHO ++ ++# Used to examine libraries when file_magic_cmd begins with "file". ++MAGIC_CMD=$MAGIC_CMD ++ ++# Must we lock files when doing compilation? ++need_locks=$lt_need_locks ++ ++# Tool to manipulate archived DWARF debug symbol files on Mac OS X. ++DSYMUTIL=$lt_DSYMUTIL ++ ++# Tool to change global to local symbols on Mac OS X. ++NMEDIT=$lt_NMEDIT ++ ++# Tool to manipulate fat objects and archives on Mac OS X. ++LIPO=$lt_LIPO ++ ++# ldd/readelf like tool for Mach-O binaries on Mac OS X. ++OTOOL=$lt_OTOOL ++ ++# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. ++OTOOL64=$lt_OTOOL64 ++ ++# Old archive suffix (normally "a"). ++libext=$libext ++ ++# Shared library suffix (normally ".so"). ++shrext_cmds=$lt_shrext_cmds ++ ++# The commands to extract the exported symbol list from a shared archive. ++extract_expsyms_cmds=$lt_extract_expsyms_cmds ++ ++# Variables whose values should be saved in libtool wrapper scripts and ++# restored at link time. ++variables_saved_for_relink=$lt_variables_saved_for_relink ++ ++# Do we need the "lib" prefix for modules? ++need_lib_prefix=$need_lib_prefix ++ ++# Do we need a version for libraries? ++need_version=$need_version ++ ++# Library versioning type. ++version_type=$version_type ++ ++# Shared library runtime path variable. ++runpath_var=$runpath_var ++ ++# Shared library path variable. ++shlibpath_var=$shlibpath_var ++ ++# Is shlibpath searched before the hard-coded library search path? ++shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++ ++# Format of library name prefix. ++libname_spec=$lt_libname_spec ++ ++# List of archive names. First name is the real one, the rest are links. ++# The last name is the one that the linker finds with -lNAME ++library_names_spec=$lt_library_names_spec ++ ++# The coded name of the library, if different from the real name. ++soname_spec=$lt_soname_spec ++ ++# Command to use after installation of a shared archive. ++postinstall_cmds=$lt_postinstall_cmds ++ ++# Command to use after uninstallation of a shared archive. ++postuninstall_cmds=$lt_postuninstall_cmds ++ ++# Commands used to finish a libtool library installation in a directory. ++finish_cmds=$lt_finish_cmds ++ ++# As "finish_cmds", except a single script fragment to be evaled but ++# not shown. ++finish_eval=$lt_finish_eval ++ ++# Whether we should hardcode library paths into libraries. ++hardcode_into_libs=$hardcode_into_libs ++ ++# Compile-time system search path for libraries. ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++ ++# Run-time system search path for libraries. ++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ ++# Whether dlopen is supported. ++dlopen_support=$enable_dlopen ++ ++# Whether dlopen of programs is supported. ++dlopen_self=$enable_dlopen_self ++ ++# Whether dlopen of statically linked programs is supported. ++dlopen_self_static=$enable_dlopen_self_static ++ ++# Commands to strip libraries. ++old_striplib=$lt_old_striplib ++striplib=$lt_striplib ++ ++ ++# The linker used to build libraries. ++LD=$lt_LD ++ ++# Commands used to build an old-style archive. ++old_archive_cmds=$lt_old_archive_cmds ++ ++# A language specific compiler. ++CC=$lt_compiler ++ ++# Is the compiler the GNU compiler? ++with_gcc=$GCC ++ ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag ++ ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++ ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic ++ ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static ++ ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_lt_cv_prog_compiler_c_o ++ ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc ++ ++# Whether or not to disallow shared libs when runtime libs are static. ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes ++ ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec ++ ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec ++ ++# Whether the compiler copes with passing no objects directly. ++compiler_needs_object=$lt_compiler_needs_object ++ ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds ++ ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds ++ ++# Commands used to build a shared archive. ++archive_cmds=$lt_archive_cmds ++archive_expsym_cmds=$lt_archive_expsym_cmds ++ ++# Commands used to build a loadable module if different from building ++# a shared archive. ++module_cmds=$lt_module_cmds ++module_expsym_cmds=$lt_module_expsym_cmds ++ ++# Whether we are building with GNU ld or not. ++with_gnu_ld=$lt_with_gnu_ld ++ ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag ++ ++# Flag that enforces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag ++ ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec ++ ++# If ld is used when linking, flag to hardcode \$libdir into a binary ++# during linking. This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld ++ ++# Whether we need a single "-rpath" flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator ++ ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary. ++hardcode_direct=$hardcode_direct ++ ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary and the resulting library dependency is ++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the ++# library is relocated. ++hardcode_direct_absolute=$hardcode_direct_absolute ++ ++# Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++# into the resulting binary. ++hardcode_minus_L=$hardcode_minus_L ++ ++# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR ++# into the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var ++ ++# Set to "yes" if building a shared library automatically hardcodes DIR ++# into the library and all subsequent libraries and executables linked ++# against it. ++hardcode_automatic=$hardcode_automatic ++ ++# Set to yes if linker adds runtime paths of dependent libraries ++# to runtime path list. ++inherit_rpath=$inherit_rpath ++ ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs ++ ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path ++ ++# Set to "yes" if exported symbols are required. ++always_export_symbols=$always_export_symbols ++ ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds ++ ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms ++ ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms ++ ++# Commands necessary for linking programs (against libraries) with templates. ++prelink_cmds=$lt_prelink_cmds ++ ++# Specify filename containing input files. ++file_list_spec=$lt_file_list_spec ++ ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action ++ ++# The directories searched by this compiler when creating a shared library. ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs ++ ++# Dependencies to place before and after the objects being linked to ++# create a shared library. ++predep_objects=$lt_predep_objects ++postdep_objects=$lt_postdep_objects ++predeps=$lt_predeps ++postdeps=$lt_postdeps ++ ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_compiler_lib_search_path ++ ++# ### END LIBTOOL CONFIG ++ ++_LT_EOF ++ ++ case $host_os in ++ aix3*) ++ cat <<\_LT_EOF >> "$cfgfile" ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++fi ++_LT_EOF ++ ;; ++ esac ++ ++ ++ltmain="$ac_aux_dir/ltmain.sh" ++ ++ ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ case $xsi_shell in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result="${1##*/}" ++} ++ ++# func_dirname_and_basename file append nondir_replacement ++# perform func_basename and func_dirname in a single function ++# call: ++# dirname: Compute the dirname of FILE. If nonempty, ++# add APPEND to the result, otherwise set result ++# to NONDIR_REPLACEMENT. ++# value returned in "$func_dirname_result" ++# basename: Compute filename of FILE. ++# value retuned in "$func_basename_result" ++# Implementation must be kept synchronized with func_dirname ++# and func_basename. For efficiency, we do not delegate to ++# those functions but instead duplicate the functionality here. ++func_dirname_and_basename () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}" ++} ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++func_stripname () ++{ ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"} ++} ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=${1%%=*} ++ func_opt_split_arg=${1#*=} ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=${1%.*}.lo ++} ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=$(( $* )) ++} ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=${#1} ++} ++ ++_LT_EOF ++ ;; ++ *) # Bourne compatible functions. ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` ++} ++ ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "X${3}" \ ++ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "X${3}" \ ++ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; ++ esac ++} ++ ++# sed scripts: ++my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' ++my_sed_long_arg='1s/^-[^=]*=//' ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` ++ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` ++} ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "$@"` ++} ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` ++} ++ ++_LT_EOF ++esac ++ ++case $lt_shell_append in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$1+=\$2" ++} ++_LT_EOF ++ ;; ++ *) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$1=\$$1\$2" ++} ++ ++_LT_EOF ++ ;; ++ esac ++ ++ ++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ mv -f "$cfgfile" "$ofile" || ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++ ++ ++ cat <<_LT_EOF >> "$ofile" ++ ++# ### BEGIN LIBTOOL TAG CONFIG: CXX ++ ++# The linker used to build libraries. ++LD=$lt_LD_CXX ++ ++# Commands used to build an old-style archive. ++old_archive_cmds=$lt_old_archive_cmds_CXX ++ ++# A language specific compiler. ++CC=$lt_compiler_CXX ++ ++# Is the compiler the GNU compiler? ++with_gcc=$GCC_CXX ++ ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX ++ ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl_CXX ++ ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic_CXX ++ ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static_CXX ++ ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX ++ ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc_CXX ++ ++# Whether or not to disallow shared libs when runtime libs are static. ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX ++ ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX ++ ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX ++ ++# Whether the compiler copes with passing no objects directly. ++compiler_needs_object=$lt_compiler_needs_object_CXX ++ ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX ++ ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX ++ ++# Commands used to build a shared archive. ++archive_cmds=$lt_archive_cmds_CXX ++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX ++ ++# Commands used to build a loadable module if different from building ++# a shared archive. ++module_cmds=$lt_module_cmds_CXX ++module_expsym_cmds=$lt_module_expsym_cmds_CXX ++ ++# Whether we are building with GNU ld or not. ++with_gnu_ld=$lt_with_gnu_ld_CXX ++ ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag_CXX ++ ++# Flag that enforces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag_CXX ++ ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX ++ ++# If ld is used when linking, flag to hardcode \$libdir into a binary ++# during linking. This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX ++ ++# Whether we need a single "-rpath" flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX ++ ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary. ++hardcode_direct=$hardcode_direct_CXX ++ ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary and the resulting library dependency is ++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the ++# library is relocated. ++hardcode_direct_absolute=$hardcode_direct_absolute_CXX ++ ++# Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++# into the resulting binary. ++hardcode_minus_L=$hardcode_minus_L_CXX ++ ++# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR ++# into the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX ++ ++# Set to "yes" if building a shared library automatically hardcodes DIR ++# into the library and all subsequent libraries and executables linked ++# against it. ++hardcode_automatic=$hardcode_automatic_CXX ++ ++# Set to yes if linker adds runtime paths of dependent libraries ++# to runtime path list. ++inherit_rpath=$inherit_rpath_CXX ++ ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs_CXX ++ ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path_CXX ++ ++# Set to "yes" if exported symbols are required. ++always_export_symbols=$always_export_symbols_CXX ++ ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds_CXX ++ ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms_CXX ++ ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms_CXX ++ ++# Commands necessary for linking programs (against libraries) with templates. ++prelink_cmds=$lt_prelink_cmds_CXX ++ ++# Specify filename containing input files. ++file_list_spec=$lt_file_list_spec_CXX ++ ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action_CXX ++ ++# The directories searched by this compiler when creating a shared library. ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX ++ ++# Dependencies to place before and after the objects being linked to ++# create a shared library. ++predep_objects=$lt_predep_objects_CXX ++postdep_objects=$lt_postdep_objects_CXX ++predeps=$lt_predeps_CXX ++postdeps=$lt_postdeps_CXX ++ ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX ++ ++# ### END LIBTOOL TAG CONFIG: CXX ++_LT_EOF ++ ++ ;; ++ "tests/shellinit":F) chmod +x tests/shellinit ;; ++ "contrib/cr_insmod":F) chmod +x contrib/cr_insmod ;; ++ "contrib/gen_cscope":F) chmod +x contrib/gen_cscope ;; ++ "contrib/batch_build":F) chmod +x contrib/batch_build ;; ++ ++ esac ++done # for ac_tag ++ ++ ++as_fn_exit 0 ++_ACEOF + ac_clean_files=$ac_clean_files_save + ++test $ac_write_fail = 0 || ++ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ + + # configure is writing to config.log, and then calls config.status. + # config.status does its own redirection, appending to config.log. +@@ -55228,7 +42320,11 @@ + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || { (exit 1); exit 1; } ++ $ac_cs_success || as_fn_exit $? ++fi ++if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 ++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi + + +diff -r 3c8a74e0c599 configure.ac +--- a/configure.ac Sun Apr 11 12:41:30 2010 +0200 ++++ b/configure.ac Sun Apr 11 16:31:36 2010 +0200 +@@ -123,6 +123,8 @@ + AC_CONFIG_AUX_DIR(./config) + AM_INIT_AUTOMAKE([foreign no-exeext std-options]) + ++AM_MAINTAINER_MODE([enable]) ++ + ################################################################################ + # Boilerplate for versions and copyrights in generated files + ################################################################################ +@@ -454,9 +456,10 @@ + AC_SUBST(CR_CLIENT_LDADD) + + # If building the tests, we can optionally test C++ +-if test x"$cr_build_tests" = xyes; then ++# Note, however, that bug 2619 reports that we can't call this conditionally. ++dnl if test x"$cr_build_tests" = xyes; then + CR_PROG_CXX +-fi ++dnl fi + + ################################################################################ + # Check libraries +@@ -843,6 +846,22 @@ + # Checks for matching (we hope) symbol table + CR_LINUX_SYMTAB + ++# Set and substitute CR_KARCH to enable i386 userland on x86_64 kernels ++CR_KARCH=$CR_ARCH ++if test $CR_ARCH = i386; then ++ # probe the System.map to find out if we need to change CR_KARCH at all. ++ # All this does is count the number of *digits* in a hex formatted address ++ AC_MSG_NOTICE([Testing if KARCH is the same as ARCH]) ++ symlen=`$LINUX_SYMTAB_CMD | head -n1 | sed 's/ .*$//;s/\(.\)/\1\n/g;s/\n$//'|wc -l` ++ if test $symlen -eq 16; then ++ AC_MSG_NOTICE([Changing KARCH to x86_64]) ++ CR_KARCH=x86_64 ++ else ++ AC_MSG_NOTICE([Not touching KARCH]) ++ fi ++fi ++AC_SUBST([CR_KARCH], $CR_KARCH) ++ + ## Check for optional kernel headers... + CR_CHECK_KERNEL_HEADER([linux/syscalls.h]) + CR_CHECK_KERNEL_HEADER([linux/pspace.h]) +@@ -985,7 +1004,7 @@ + fi + + # put_task_struct() requires one of these: +-CR_FIND_KSYM([__put_task_struct],[CODE]) ++CR_FIND_KSYM([__put_task_struct],[CODE],[extern void __put_task_struct(struct task_struct *);]) + CR_FIND_KSYM([__put_task_struct_cb],[CODE]) + + CR_CHECK_KERNEL_MEMBER([mm.task_size],[#include ], +@@ -1025,7 +1044,7 @@ + if test -n "${HAVE_MAP_VSYSCALL}"; then + CR_FIND_KSYM([map_vsyscall],[CODE]) + fi +-if test $CR_ARCH = x86_64; then ++if test $CR_KARCH = x86_64; then + CR_FIND_KSYM([syscall32_setup_pages],[CODE], + [extern int syscall32_setup_pages(void *, int);]) + fi +@@ -1093,7 +1112,7 @@ + CR_FIND_KSYM([do_sigaltstack],[CODE], + [extern int do_sigaltstack(const stack_t *, stack_t *, unsigned long);]) + +-if test $CR_ARCH = i386 -o $CR_ARCH = x86_64; then ++if test $CR_KARCH = i386 -o $CR_KARCH = x86_64; then + CR_CHECK_KERNEL_TYPE([struct n_desc_struct],[ + #include + #include ]) +@@ -1144,7 +1163,7 @@ + fi + fi + +-if test $CR_ARCH = i386; then ++if test $CR_KARCH = i386; then + CR_CHECK_KERNEL_MEMBER([pt_regs.xcs],[#include ],[struct pt_regs],[int],[xcs]) + CR_CHECK_KERNEL_MEMBER([pt_regs.xfs],[#include ],[struct pt_regs],[int],[xfs]) + CR_CHECK_KERNEL_MEMBER([pt_regs.xgs],[#include ],[struct pt_regs],[int],[xgs]) +@@ -1230,6 +1249,7 @@ + if test -z "${HAVE_2_ARG_FIND_PID}${HAVE_FIND_TASK_BY_PID}${HAVE_FIND_TASK_BY_PID_NS}"; then + CR_BAD_KERNEL([unable to determine how to map (type, pid_nr) -> struct task]) + fi ++CR_FIND_KSYM([find_task_by_pid_ns],[CODE]) + + CR_CHECK_KERNEL_CALL([alloc_pid],[#include ]) + if test -n "${HAVE_ALLOC_PID}"; then +@@ -1492,7 +1512,7 @@ + CR_FIND_KSYM([sys_mremap],[CODE], + [extern asmlinkage unsigned long sys_mremap(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr);]) + CR_FIND_KSYM([do_sigaction],[CODE]) +-if test $CR_ARCH = x86_64; then ++if test $CR_KARCH = x86_64; then + CR_FIND_KSYM([load_gs_index],[CODE]) + + CR_CHECK_KERNEL_CALL([read_pda],[#include ]) +@@ -1536,7 +1556,10 @@ + # the System.map used to locate symbols and configure time. + CR_FIND_EXPORTED_KSYM([register_chrdev],[CODE]) + if test "$cr_addr" = "0"; then +- CR_BAD_KERNEL([kernel does not export register_chrdev]) ++ CR_FIND_EXPORTED_KSYM([__register_chrdev],[CODE]) ++ if test "$cr_addr" = "0"; then ++ CR_BAD_KERNEL([kernel does not export register_chrdev or __register_chrdev]) ++ fi + fi + CR_FIND_EXPORTED_KSYM([register_blkdev],[CODE]) + if test "$cr_addr" = "0"; then +diff -r 3c8a74e0c599 contrib/Makefile.in +--- a/contrib/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/contrib/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -14,15 +15,12 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -34,6 +32,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + subdir = contrib + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +@@ -44,80 +43,36 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = cr_insmod gen_cscope batch_build ++CONFIG_CLEAN_VPATH_FILES = + SCRIPTS = $(noinst_SCRIPTS) + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -138,20 +93,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -159,12 +114,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -178,70 +132,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + + # Maintainer scripts requiring substitutions: + noinst_SCRIPTS = cr_insmod gen_cscope batch_build +@@ -250,18 +225,18 @@ + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign contrib/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign contrib/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -275,10 +250,11 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + cr_insmod: $(top_builddir)/config.status $(srcdir)/cr_insmod.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + gen_cscope: $(top_builddir)/config.status $(srcdir)/gen_cscope.in +@@ -291,10 +267,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -303,29 +275,32 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -352,7 +327,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -363,7 +339,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -371,18 +347,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -401,17 +397,21 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -r 3c8a74e0c599 cr_module/Makefile.am +--- a/cr_module/Makefile.am Sun Apr 11 12:41:30 2010 +0200 ++++ b/cr_module/Makefile.am Sun Apr 11 16:31:36 2010 +0200 +@@ -31,13 +31,13 @@ + + BPROC_VERSION = "4.0.0pre8" + vmadump_dir = $(top_srcdir)/vmadump4 +-vmad_sources = $(vmadump_dir)/vmadump_common.c $(vmadump_dir)/vmadump_@CR_ARCH@.c ++vmad_sources = $(vmadump_dir)/vmadump_common.c $(vmadump_dir)/vmadump_@CR_KARCH@.c + vmad_include = -I$(vmadump_dir) -D__NR_vmadump=-1 -DBPROC_VERSION='$(BPROC_VERSION)' + + cr_sources = $(my_sources) $(vmad_sources) + INCLUDES = -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ +- -I$(srcdir)/arch/@CR_ARCH@ \ ++ -I$(srcdir)/arch/@CR_KARCH@ \ + $(vmad_include) + + # echo an arbitrary make/environment variable (needed by kbuild glue) +diff -r 3c8a74e0c599 cr_module/Makefile.in +--- a/cr_module/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/cr_module/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -13,15 +14,12 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -33,6 +31,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + subdir = cr_module + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -41,88 +40,75 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -143,20 +129,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -164,12 +150,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -183,70 +168,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + + # Needed by kbuild glue + my_sources = \ +@@ -281,12 +287,12 @@ + + BPROC_VERSION = "4.0.0pre8" + vmadump_dir = $(top_srcdir)/vmadump4 +-vmad_sources = $(vmadump_dir)/vmadump_common.c $(vmadump_dir)/vmadump_@CR_ARCH@.c ++vmad_sources = $(vmadump_dir)/vmadump_common.c $(vmadump_dir)/vmadump_@CR_KARCH@.c + vmad_include = -I$(vmadump_dir) -D__NR_vmadump=-1 -DBPROC_VERSION='$(BPROC_VERSION)' + cr_sources = $(my_sources) $(vmad_sources) + INCLUDES = -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ +- -I$(srcdir)/arch/@CR_ARCH@ \ ++ -I$(srcdir)/arch/@CR_KARCH@ \ + $(vmad_include) + + EXTRA_DIST = arch license.txt $(my_sources) +@@ -294,18 +300,18 @@ + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign cr_module/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign cr_module/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign cr_module/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign cr_module/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -319,10 +325,11 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo +@@ -330,10 +337,6 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -341,7 +344,13 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @fail= failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -352,16 +361,21 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @fail= failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -381,16 +395,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -398,94 +412,120 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ test ! -f $$subdir/TAGS || \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || mkdir "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- (cd $$subdir && \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="../$(top_distdir)" \ +- distdir="../$(distdir)/$$subdir" \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -514,7 +554,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -525,8 +566,7 @@ + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -534,18 +574,38 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-recursive ++ ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-pdf-am: ++ ++install-ps: install-ps-recursive ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -564,28 +624,31 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ ++ install-am install-strip tags-recursive + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am html \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ ctags ctags-recursive distclean distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + + # echo an arbitrary make/environment variable (needed by kbuild glue) + echoval: + @echo $($(VARNAME)) | sed 's/"/\\"/'g + .PHONY: echoval ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 cr_module/cr_kcompat.h +--- a/cr_module/cr_kcompat.h Sun Apr 11 12:41:30 2010 +0200 ++++ b/cr_module/cr_kcompat.h Sun Apr 11 16:31:36 2010 +0200 +@@ -274,7 +274,8 @@ + #elif HAVE_2_ARG_FIND_PID + #define cr_have_pid(T,P) (find_pid((T),(P)) != NULL) + #else +- #error ++ // XXX: untested! ++ #define cr_have_pid(T,P) (pid_task(find_vpid(P),(T)) != NULL) + #endif + + // Process table iterators +@@ -583,4 +584,9 @@ + #error "no cr_do_pipe() definition" + #endif + ++#if !defined(DECLARE_MUTEX) ++ #define DECLARE_MUTEX(m) DEFINE_SEMAPHORE(m) ++ #define init_MUTEX(m) sema_init(m, 1) ++#endif ++ + #endif /* _CR_KCOMPAT_H */ +diff -r 3c8a74e0c599 doc/Makefile.in +--- a/doc/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/doc/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -13,15 +14,12 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -33,6 +31,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + subdir = doc + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -41,79 +40,35 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -134,20 +89,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -155,12 +110,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -174,70 +128,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + + # List of files to distribute + EXTRA_DIST = README \ +@@ -249,18 +224,18 @@ + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign doc/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign doc/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -274,20 +249,17 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -296,30 +268,32 @@ + + + distdir: $(DISTFILES) +- $(mkdir_p) $(distdir)/html +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -346,7 +320,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -357,7 +332,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -365,18 +340,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -395,17 +390,21 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -r 3c8a74e0c599 etc/Makefile.in +--- a/etc/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/etc/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -13,15 +14,12 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -33,6 +31,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + subdir = etc + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -41,79 +40,35 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -134,20 +89,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -155,12 +110,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -174,87 +128,108 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + EXTRA_DIST = license.txt blcr.rc + module_dir = $(shell echo '@CR_MODULE_DIR@' | sed -e 's/@LINUX_VER@/`uname -r`/') + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign etc/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign etc/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign etc/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign etc/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -268,20 +243,17 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -290,29 +262,32 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -339,7 +314,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -350,7 +326,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -358,18 +334,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: install-exec-local + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -388,17 +384,21 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ +- install-exec-local install-info install-info-am install-man \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-exec-local install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ uninstall uninstall-am uninstall-local + + + install-exec-local: +@@ -408,6 +408,7 @@ + chmod 755 $(DESTDIR)$(sysconfdir)/init.d/blcr + uninstall-local: + rm -f $(DESTDIR)$(sysconfdir)/init.d/blcr ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 examples/Makefile.in +--- a/examples/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/examples/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -13,15 +14,12 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -33,6 +31,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + subdir = examples + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -41,88 +40,75 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -143,20 +129,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -164,12 +150,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -183,88 +168,109 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + SUBDIRS = counting pthread_counting pthread_misc file_counting io_bench pipe_counting + MOSTLYCLEANFILES = context.* + EXTRA_DIST = license.txt README + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign examples/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -278,10 +284,11 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo +@@ -289,10 +296,6 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -300,7 +303,13 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @fail= failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -311,16 +320,21 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @fail= failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -340,16 +354,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -357,94 +371,120 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ test ! -f $$subdir/TAGS || \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || mkdir "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- (cd $$subdir && \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="../$(top_distdir)" \ +- distdir="../$(distdir)/$$subdir" \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -474,7 +514,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -485,8 +526,7 @@ + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -494,18 +534,38 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-recursive ++ ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-pdf-am: ++ ++install-ps: install-ps-recursive ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -524,25 +584,28 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ ++ install-am install-strip tags-recursive + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ +- check-am clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am all-local check check-am clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am uninstall-info-am ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + + all-local: + if test -d $(top_builddir)/libcr32/examples; then $(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/libcr32/examples all; fi ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 examples/counting/Makefile.in +--- a/examples/counting/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/examples/counting/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -14,17 +15,12 @@ + + @SET_MAKE@ + +-SOURCES = counting.c +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -36,6 +32,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + noinst_PROGRAMS = counting$(EXEEXT) + @CR_INSTALLED_LIBCR_TRUE@counting_DEPENDENCIES = \ +@@ -47,98 +44,55 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + PROGRAMS = $(noinst_PROGRAMS) + counting_SOURCES = counting.c + counting_OBJECTS = counting.$(OBJEXT) + counting_LDADD = $(LDADD) + am__DEPENDENCIES_1 = +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/./config/depcomp + am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/counting.Po ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = counting.c + DIST_SOURCES = counting.c + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -159,20 +113,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -180,12 +134,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -199,70 +152,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + @CR_INSTALLED_LIBCR_FALSE@libcr_ldflag = -L$(top_builddir)/libcr + @CR_INSTALLED_LIBCR_TRUE@libcr_ldflag = -L$(libdir) + @CR_INSTALLED_LIBCR_FALSE@counting_DEPENDENCIES = $(top_builddir)/libcr/libcr.la +@@ -273,18 +247,18 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/counting/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/counting/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/counting/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign examples/counting/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -298,20 +272,23 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + clean-noinstPROGRAMS: +- @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + counting$(EXEEXT): $(counting_OBJECTS) $(counting_DEPENDENCIES) + @rm -f counting$(EXEEXT) +- $(LINK) $(counting_LDFLAGS) $(counting_OBJECTS) $(counting_LDADD) $(LIBS) ++ $(LINK) $(counting_OBJECTS) $(counting_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -322,27 +299,24 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/counting.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -351,80 +325,85 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -452,7 +431,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -466,7 +446,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -474,18 +454,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -506,24 +506,28 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-info-am ++ pdf pdf-am ps ps-am tags uninstall uninstall-am + + @CR_INSTALLED_LIBCR_FALSE@$(top_builddir)/libcr/libcr.la: FORCE + @CR_INSTALLED_LIBCR_FALSE@ @$(MAKE) $(AM_MAKEFLAGS) --no-print-directory -C $(top_builddir)/libcr libcr.la + @CR_INSTALLED_LIBCR_FALSE@.PHONY: FORCE + @CR_INSTALLED_LIBCR_FALSE@FORCE: ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 examples/file_counting/Makefile.in +--- a/examples/file_counting/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/examples/file_counting/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -14,17 +15,12 @@ + + @SET_MAKE@ + +-SOURCES = file_counting.c +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -36,6 +32,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + noinst_PROGRAMS = file_counting$(EXEEXT) + @CR_INSTALLED_LIBCR_TRUE@file_counting_DEPENDENCIES = \ +@@ -47,98 +44,55 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + PROGRAMS = $(noinst_PROGRAMS) + file_counting_SOURCES = file_counting.c + file_counting_OBJECTS = file_counting.$(OBJEXT) + file_counting_LDADD = $(LDADD) + am__DEPENDENCIES_1 = +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/./config/depcomp + am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/file_counting.Po ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = file_counting.c + DIST_SOURCES = file_counting.c + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -159,20 +113,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -180,12 +134,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -199,70 +152,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + @CR_INSTALLED_LIBCR_FALSE@libcr_ldflag = -L$(top_builddir)/libcr + @CR_INSTALLED_LIBCR_TRUE@libcr_ldflag = -L$(libdir) + @CR_INSTALLED_LIBCR_FALSE@file_counting_DEPENDENCIES = $(top_builddir)/libcr/libcr.la +@@ -273,18 +247,18 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/file_counting/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/file_counting/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/file_counting/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign examples/file_counting/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -298,20 +272,23 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + clean-noinstPROGRAMS: +- @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + file_counting$(EXEEXT): $(file_counting_OBJECTS) $(file_counting_DEPENDENCIES) + @rm -f file_counting$(EXEEXT) +- $(LINK) $(file_counting_LDFLAGS) $(file_counting_OBJECTS) $(file_counting_LDADD) $(LIBS) ++ $(LINK) $(file_counting_OBJECTS) $(file_counting_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -322,27 +299,24 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_counting.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -351,80 +325,85 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -452,7 +431,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -466,7 +446,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -474,18 +454,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -506,24 +506,28 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-info-am ++ pdf pdf-am ps ps-am tags uninstall uninstall-am + + @CR_INSTALLED_LIBCR_FALSE@$(top_builddir)/libcr/libcr.la: FORCE + @CR_INSTALLED_LIBCR_FALSE@ @$(MAKE) $(AM_MAKEFLAGS) --no-print-directory -C $(top_builddir)/libcr libcr.la + @CR_INSTALLED_LIBCR_FALSE@.PHONY: FORCE + @CR_INSTALLED_LIBCR_FALSE@FORCE: ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 examples/io_bench/Makefile.in +--- a/examples/io_bench/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/examples/io_bench/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -14,17 +15,12 @@ + + @SET_MAKE@ + +-SOURCES = io_bench.c +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -36,6 +32,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + noinst_PROGRAMS = io_bench$(EXEEXT) + @CR_INSTALLED_LIBCR_TRUE@io_bench_DEPENDENCIES = \ +@@ -47,98 +44,55 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + PROGRAMS = $(noinst_PROGRAMS) + io_bench_SOURCES = io_bench.c + io_bench_OBJECTS = io_bench.$(OBJEXT) + io_bench_LDADD = $(LDADD) + am__DEPENDENCIES_1 = +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/./config/depcomp + am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/io_bench.Po ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = io_bench.c + DIST_SOURCES = io_bench.c + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -159,20 +113,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -180,12 +134,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -199,70 +152,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + @CR_INSTALLED_LIBCR_FALSE@libcr_ldflag = -L$(top_builddir)/libcr + @CR_INSTALLED_LIBCR_TRUE@libcr_ldflag = -L$(libdir) + @CR_INSTALLED_LIBCR_FALSE@libcr_includes = -I$(top_srcdir)/include -I$(top_builddir)/include +@@ -276,18 +250,18 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/io_bench/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/io_bench/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/io_bench/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign examples/io_bench/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -301,20 +275,23 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + clean-noinstPROGRAMS: +- @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + io_bench$(EXEEXT): $(io_bench_OBJECTS) $(io_bench_DEPENDENCIES) + @rm -f io_bench$(EXEEXT) +- $(LINK) $(io_bench_LDFLAGS) $(io_bench_OBJECTS) $(io_bench_LDADD) $(LIBS) ++ $(LINK) $(io_bench_OBJECTS) $(io_bench_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -325,27 +302,24 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io_bench.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -354,80 +328,85 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -455,7 +434,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -469,7 +449,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -477,18 +457,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -509,24 +509,28 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-info-am ++ pdf pdf-am ps ps-am tags uninstall uninstall-am + + @CR_INSTALLED_LIBCR_FALSE@$(top_builddir)/libcr/libcr.la: FORCE + @CR_INSTALLED_LIBCR_FALSE@ @$(MAKE) $(AM_MAKEFLAGS) --no-print-directory -C $(top_builddir)/libcr libcr.la + @CR_INSTALLED_LIBCR_FALSE@.PHONY: FORCE + @CR_INSTALLED_LIBCR_FALSE@FORCE: ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 examples/pipe_counting/Makefile.in +--- a/examples/pipe_counting/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/examples/pipe_counting/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -14,17 +15,12 @@ + + @SET_MAKE@ + +-SOURCES = pipe_counting.c +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -36,6 +32,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + noinst_PROGRAMS = pipe_counting$(EXEEXT) + @CR_INSTALLED_LIBCR_TRUE@pipe_counting_DEPENDENCIES = \ +@@ -47,98 +44,55 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + PROGRAMS = $(noinst_PROGRAMS) + pipe_counting_SOURCES = pipe_counting.c + pipe_counting_OBJECTS = pipe_counting.$(OBJEXT) + pipe_counting_LDADD = $(LDADD) + am__DEPENDENCIES_1 = +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/./config/depcomp + am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pipe_counting.Po ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = pipe_counting.c + DIST_SOURCES = pipe_counting.c + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -159,20 +113,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -180,12 +134,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -199,70 +152,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + @CR_INSTALLED_LIBCR_FALSE@libcr_ldflag = -L$(top_builddir)/libcr + @CR_INSTALLED_LIBCR_TRUE@libcr_ldflag = -L$(libdir) + @CR_INSTALLED_LIBCR_FALSE@pipe_counting_DEPENDENCIES = $(top_builddir)/libcr/libcr.la +@@ -273,18 +247,18 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/pipe_counting/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/pipe_counting/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/pipe_counting/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign examples/pipe_counting/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -298,20 +272,23 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + clean-noinstPROGRAMS: +- @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + pipe_counting$(EXEEXT): $(pipe_counting_OBJECTS) $(pipe_counting_DEPENDENCIES) + @rm -f pipe_counting$(EXEEXT) +- $(LINK) $(pipe_counting_LDFLAGS) $(pipe_counting_OBJECTS) $(pipe_counting_LDADD) $(LIBS) ++ $(LINK) $(pipe_counting_OBJECTS) $(pipe_counting_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -322,27 +299,24 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe_counting.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -351,80 +325,85 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -452,7 +431,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -466,7 +446,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -474,18 +454,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -506,24 +506,28 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-info-am ++ pdf pdf-am ps ps-am tags uninstall uninstall-am + + @CR_INSTALLED_LIBCR_FALSE@$(top_builddir)/libcr/libcr.la: FORCE + @CR_INSTALLED_LIBCR_FALSE@ @$(MAKE) $(AM_MAKEFLAGS) --no-print-directory -C $(top_builddir)/libcr libcr.la + @CR_INSTALLED_LIBCR_FALSE@.PHONY: FORCE + @CR_INSTALLED_LIBCR_FALSE@FORCE: ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 examples/pthread_counting/Makefile.in +--- a/examples/pthread_counting/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/examples/pthread_counting/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -14,17 +15,12 @@ + + @SET_MAKE@ + +-SOURCES = pthread_counting.c +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -36,6 +32,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + noinst_PROGRAMS = pthread_counting$(EXEEXT) + @CR_INSTALLED_LIBCR_TRUE@pthread_counting_DEPENDENCIES = \ +@@ -47,98 +44,55 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + PROGRAMS = $(noinst_PROGRAMS) + pthread_counting_SOURCES = pthread_counting.c + pthread_counting_OBJECTS = pthread_counting.$(OBJEXT) + pthread_counting_LDADD = $(LDADD) + am__DEPENDENCIES_1 = +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/./config/depcomp + am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pthread_counting.Po ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = pthread_counting.c + DIST_SOURCES = pthread_counting.c + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -159,20 +113,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -180,12 +134,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -199,70 +152,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + @CR_INSTALLED_LIBCR_FALSE@libcr_ldflag = -L$(top_builddir)/libcr + @CR_INSTALLED_LIBCR_TRUE@libcr_ldflag = -L$(libdir) + @CR_INSTALLED_LIBCR_FALSE@pthread_counting_DEPENDENCIES = $(top_builddir)/libcr/libcr.la +@@ -274,18 +248,18 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/pthread_counting/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/pthread_counting/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/pthread_counting/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign examples/pthread_counting/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -299,20 +273,23 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + clean-noinstPROGRAMS: +- @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + pthread_counting$(EXEEXT): $(pthread_counting_OBJECTS) $(pthread_counting_DEPENDENCIES) + @rm -f pthread_counting$(EXEEXT) +- $(LINK) $(pthread_counting_LDFLAGS) $(pthread_counting_OBJECTS) $(pthread_counting_LDADD) $(LIBS) ++ $(LINK) $(pthread_counting_OBJECTS) $(pthread_counting_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -323,27 +300,24 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_counting.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -352,80 +326,85 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -453,7 +432,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -467,7 +447,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -475,18 +455,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -507,24 +507,28 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-info-am ++ pdf pdf-am ps ps-am tags uninstall uninstall-am + + @CR_INSTALLED_LIBCR_FALSE@$(top_builddir)/libcr/libcr.la: FORCE + @CR_INSTALLED_LIBCR_FALSE@ @$(MAKE) $(AM_MAKEFLAGS) --no-print-directory -C $(top_builddir)/libcr libcr.la + @CR_INSTALLED_LIBCR_FALSE@.PHONY: FORCE + @CR_INSTALLED_LIBCR_FALSE@FORCE: ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 examples/pthread_misc/Makefile.in +--- a/examples/pthread_misc/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/examples/pthread_misc/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -14,17 +15,12 @@ + + @SET_MAKE@ + +-SOURCES = pthread_misc.c +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -36,6 +32,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + noinst_PROGRAMS = pthread_misc$(EXEEXT) + @CR_INSTALLED_LIBCR_TRUE@pthread_misc_DEPENDENCIES = \ +@@ -47,98 +44,55 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + PROGRAMS = $(noinst_PROGRAMS) + pthread_misc_SOURCES = pthread_misc.c + pthread_misc_OBJECTS = pthread_misc.$(OBJEXT) + pthread_misc_LDADD = $(LDADD) + am__DEPENDENCIES_1 = +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/./config/depcomp + am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pthread_misc.Po ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = pthread_misc.c + DIST_SOURCES = pthread_misc.c + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -159,20 +113,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -180,12 +134,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -199,70 +152,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + @CR_INSTALLED_LIBCR_FALSE@libcr_ldflag = -L$(top_builddir)/libcr + @CR_INSTALLED_LIBCR_TRUE@libcr_ldflag = -L$(libdir) + @CR_INSTALLED_LIBCR_FALSE@libcr_includes = -I$(top_srcdir)/include -I$(top_builddir)/include +@@ -276,18 +250,18 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/pthread_misc/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/pthread_misc/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/pthread_misc/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign examples/pthread_misc/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -301,20 +275,23 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + clean-noinstPROGRAMS: +- @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + pthread_misc$(EXEEXT): $(pthread_misc_OBJECTS) $(pthread_misc_DEPENDENCIES) + @rm -f pthread_misc$(EXEEXT) +- $(LINK) $(pthread_misc_LDFLAGS) $(pthread_misc_OBJECTS) $(pthread_misc_LDADD) $(LIBS) ++ $(LINK) $(pthread_misc_OBJECTS) $(pthread_misc_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -325,27 +302,24 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_misc.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -354,80 +328,85 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -455,7 +434,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -469,7 +449,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -477,18 +457,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -509,24 +509,28 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-info-am ++ pdf pdf-am ps ps-am tags uninstall uninstall-am + + @CR_INSTALLED_LIBCR_FALSE@$(top_builddir)/libcr/libcr.la: FORCE + @CR_INSTALLED_LIBCR_FALSE@ @$(MAKE) $(AM_MAKEFLAGS) --no-print-directory -C $(top_builddir)/libcr libcr.la + @CR_INSTALLED_LIBCR_FALSE@.PHONY: FORCE + @CR_INSTALLED_LIBCR_FALSE@FORCE: ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 include/Makefile.in +--- a/include/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/include/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -14,15 +15,12 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -34,6 +32,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + subdir = include + DIST_COMMON = $(am__include_HEADERS_DIST) $(am__noinst_HEADERS_DIST) \ +@@ -44,16 +43,36 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = blcr_imports.h blcr_common.h ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + am__include_HEADERS_DIST = blcr_ioctl.h blcr_proc.h blcr_errcodes.h \ + libcr.h ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" +-includeHEADERS_INSTALL = $(INSTALL_HEADER) +-nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER) + am__noinst_HEADERS_DIST = blcr_ksyms.h blcr_vmadump.h + HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ + $(nodist_noinst_HEADERS) $(noinst_HEADERS) +@@ -61,72 +80,27 @@ + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -147,20 +121,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -168,12 +142,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -187,70 +160,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + @CR_BUILD_INCLUDE_TRUE@include_HEADERS = blcr_ioctl.h blcr_proc.h blcr_errcodes.h libcr.h + @CR_BUILD_INCLUDE_TRUE@nodist_include_HEADERS = blcr_common.h + @CR_BUILD_INCLUDE_TRUE@noinst_HEADERS = blcr_ksyms.h blcr_vmadump.h +@@ -259,18 +253,18 @@ + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign include/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign include/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -284,10 +278,11 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + blcr_imports.h: $(top_builddir)/config.status $(srcdir)/blcr_imports.h.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + blcr_common.h: $(top_builddir)/config.status $(srcdir)/blcr_common.h.in +@@ -298,115 +293,126 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" +- @list='$(include_HEADERS)'; for p in $$list; do \ ++ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" ++ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ +- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ ++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ + done + + uninstall-includeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(include_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(includedir)/$$f"; \ +- done ++ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(includedir)" && rm -f $$files + install-nodist_includeHEADERS: $(nodist_include_HEADERS) + @$(NORMAL_INSTALL) +- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" +- @list='$(nodist_include_HEADERS)'; for p in $$list; do \ ++ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" ++ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ +- $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ ++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ + done + + uninstall-nodist_includeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(nodist_include_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(includedir)/$$f"; \ +- done ++ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(includedir)" && rm -f $$files + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -415,7 +421,7 @@ + all-am: Makefile $(HEADERS) all-local + installdirs: + for dir in "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -436,7 +442,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -447,8 +454,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-am + +@@ -456,18 +462,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: install-includeHEADERS install-nodist_includeHEADERS + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -486,20 +512,23 @@ + + ps-am: + +-uninstall-am: uninstall-includeHEADERS uninstall-info-am \ +- uninstall-nodist_includeHEADERS ++uninstall-am: uninstall-includeHEADERS uninstall-nodist_includeHEADERS ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ + clean-generic clean-libtool ctags distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am \ + install-includeHEADERS install-info install-info-am \ +- install-man install-nodist_includeHEADERS install-strip \ ++ install-man install-nodist_includeHEADERS install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-includeHEADERS uninstall-info-am \ ++ uninstall-am uninstall-includeHEADERS \ + uninstall-nodist_includeHEADERS + + +@@ -508,6 +537,7 @@ + + all-local: + if test -d $(top_builddir)/libcr32/include; then $(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/libcr32/include all; fi ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 include/blcr_ksyms.h +--- a/include/blcr_ksyms.h Sun Apr 11 12:41:30 2010 +0200 ++++ b/include/blcr_ksyms.h Sun Apr 11 16:31:36 2010 +0200 +@@ -55,7 +55,11 @@ + + #if defined(__i386__) || defined(__x86_64__) + #ifdef CONFIG_RELOCATABLE +- #define _CR_RELOC_KSYM(_addr) (_addr - CR_EXPORTED_KCODE_register_chrdev + register_chrdev) ++ #ifndef CR_EXPORTED_KCODE___register_chrdev ++ #define _CR_RELOC_KSYM(_addr) (_addr - CR_EXPORTED_KCODE_register_chrdev + register_chrdev) ++ #else ++ #define _CR_RELOC_KSYM(_addr) (_addr - CR_EXPORTED_KCODE___register_chrdev + __register_chrdev) ++ #endif + #else + #define _CR_RELOC_KSYM(_addr) _addr + #endif +diff -r 3c8a74e0c599 libcr/Makefile.in +--- a/libcr/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/libcr/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -15,17 +16,12 @@ + @SET_MAKE@ + + +-SOURCES = $(libcr_la_SOURCES) $(libcr_omit_la_SOURCES) $(libcr_run_la_SOURCES) +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,6 +33,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + subdir = libcr + DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ +@@ -46,11 +43,32 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(libdir)" +-libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) + libcr_la_DEPENDENCIES = + am__libcr_la_SOURCES_DIST = cr_ftb.c cr_async.c cr_core.c cr_cs.c \ +@@ -63,47 +81,40 @@ + libcr_la-cr_trace.lo libcr_la-cr_strerror.lo \ + libcr_la-cr_request.lo libcr_la-cr_omit.lo libcr_la-cr_run.lo + libcr_la_OBJECTS = $(am_libcr_la_OBJECTS) ++libcr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(libcr_la_CFLAGS) $(CFLAGS) \ ++ $(libcr_la_LDFLAGS) $(LDFLAGS) -o $@ + libcr_omit_la_DEPENDENCIES = + am__libcr_omit_la_SOURCES_DIST = cr_omit.c cr_trace.c cr_sig_sync.c + @LIBCR_TRACING_TRUE@am__objects_2 = libcr_omit_la-cr_trace.lo \ + @LIBCR_TRACING_TRUE@ libcr_omit_la-cr_sig_sync.lo + am_libcr_omit_la_OBJECTS = libcr_omit_la-cr_omit.lo $(am__objects_2) + libcr_omit_la_OBJECTS = $(am_libcr_omit_la_OBJECTS) ++libcr_omit_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libcr_omit_la_CFLAGS) \ ++ $(CFLAGS) $(libcr_omit_la_LDFLAGS) $(LDFLAGS) -o $@ + libcr_run_la_DEPENDENCIES = + am__libcr_run_la_SOURCES_DIST = cr_run.c cr_trace.c cr_sig_sync.c + @LIBCR_TRACING_TRUE@am__objects_3 = libcr_run_la-cr_trace.lo \ + @LIBCR_TRACING_TRUE@ libcr_run_la-cr_sig_sync.lo + am_libcr_run_la_OBJECTS = libcr_run_la-cr_run.lo $(am__objects_3) + libcr_run_la_OBJECTS = $(am_libcr_run_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++libcr_run_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libcr_run_la_CFLAGS) \ ++ $(CFLAGS) $(libcr_run_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/./config/depcomp + am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libcr_la-cr_async.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_la-cr_core.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_la-cr_cs.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_la-cr_ftb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_la-cr_omit.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_la-cr_pthread.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_la-cr_request.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_la-cr_run.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_la-cr_sig_sync.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_la-cr_strerror.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_la-cr_syscall.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_la-cr_trace.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_omit_la-cr_omit.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_omit_la-cr_sig_sync.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_omit_la-cr_trace.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_run_la-cr_run.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_run_la-cr_sig_sync.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libcr_run_la-cr_trace.Plo ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libcr_la_SOURCES) $(libcr_omit_la_SOURCES) \ + $(libcr_run_la_SOURCES) + DIST_SOURCES = $(am__libcr_la_SOURCES_DIST) \ +@@ -114,72 +125,27 @@ + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -200,20 +166,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -221,12 +187,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -240,70 +205,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + lib_LTLIBRARIES = libcr.la libcr_run.la libcr_omit.la + CR_LIB_VERSION = -version-info @LIBTOOL_INTERFACE@:@LIBTOOL_REVISION@:@LIBTOOL_AGE@ + noinst_HEADERS = \ +@@ -356,18 +342,18 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libcr/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign libcr/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libcr/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign libcr/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -381,43 +367,48 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ list2=; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ list2="$$list2 $$p"; \ + else :; fi; \ +- done ++ done; \ ++ test -z "$$list2" || { \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ } + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + + clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libcr.la: $(libcr_la_OBJECTS) $(libcr_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libcr_la_LDFLAGS) $(libcr_la_OBJECTS) $(libcr_la_LIBADD) $(LIBS) ++ $(libcr_la_LINK) -rpath $(libdir) $(libcr_la_OBJECTS) $(libcr_la_LIBADD) $(LIBS) + libcr_omit.la: $(libcr_omit_la_OBJECTS) $(libcr_omit_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libcr_omit_la_LDFLAGS) $(libcr_omit_la_OBJECTS) $(libcr_omit_la_LIBADD) $(LIBS) ++ $(libcr_omit_la_LINK) -rpath $(libdir) $(libcr_omit_la_OBJECTS) $(libcr_omit_la_LIBADD) $(LIBS) + libcr_run.la: $(libcr_run_la_OBJECTS) $(libcr_run_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libcr_run_la_LDFLAGS) $(libcr_run_la_OBJECTS) $(libcr_run_la_LIBADD) $(LIBS) ++ $(libcr_run_la_LINK) -rpath $(libdir) $(libcr_run_la_OBJECTS) $(libcr_run_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -445,460 +436,151 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcr_run_la-cr_trace.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +-libcr_la-cr_ftb.o: cr_ftb.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_ftb.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_ftb.Tpo" -c -o libcr_la-cr_ftb.o `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo" "$(DEPDIR)/libcr_la-cr_ftb.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_ftb.c' object='libcr_la-cr_ftb.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_ftb.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_ftb.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_ftb.o `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c +- +-libcr_la-cr_ftb.obj: cr_ftb.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_ftb.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_ftb.Tpo" -c -o libcr_la-cr_ftb.obj `if test -f 'cr_ftb.c'; then $(CYGPATH_W) 'cr_ftb.c'; else $(CYGPATH_W) '$(srcdir)/cr_ftb.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo" "$(DEPDIR)/libcr_la-cr_ftb.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_ftb.c' object='libcr_la-cr_ftb.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_ftb.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_ftb.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_ftb.obj `if test -f 'cr_ftb.c'; then $(CYGPATH_W) 'cr_ftb.c'; else $(CYGPATH_W) '$(srcdir)/cr_ftb.c'; fi` +- + libcr_la-cr_ftb.lo: cr_ftb.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_ftb.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_ftb.Tpo" -c -o libcr_la-cr_ftb.lo `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo" "$(DEPDIR)/libcr_la-cr_ftb.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_ftb.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_ftb.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_ftb.Tpo -c -o libcr_la-cr_ftb.lo `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_la-cr_ftb.Tpo $(DEPDIR)/libcr_la-cr_ftb.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_ftb.c' object='libcr_la-cr_ftb.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_ftb.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_ftb.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_ftb.lo `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c +- +-libcr_la-cr_async.o: cr_async.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_async.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_async.Tpo" -c -o libcr_la-cr_async.o `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_async.Tpo" "$(DEPDIR)/libcr_la-cr_async.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_async.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_async.c' object='libcr_la-cr_async.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_async.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_async.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_async.o `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c +- +-libcr_la-cr_async.obj: cr_async.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_async.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_async.Tpo" -c -o libcr_la-cr_async.obj `if test -f 'cr_async.c'; then $(CYGPATH_W) 'cr_async.c'; else $(CYGPATH_W) '$(srcdir)/cr_async.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_async.Tpo" "$(DEPDIR)/libcr_la-cr_async.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_async.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_async.c' object='libcr_la-cr_async.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_async.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_async.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_async.obj `if test -f 'cr_async.c'; then $(CYGPATH_W) 'cr_async.c'; else $(CYGPATH_W) '$(srcdir)/cr_async.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_ftb.lo `test -f 'cr_ftb.c' || echo '$(srcdir)/'`cr_ftb.c + + libcr_la-cr_async.lo: cr_async.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_async.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_async.Tpo" -c -o libcr_la-cr_async.lo `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_async.Tpo" "$(DEPDIR)/libcr_la-cr_async.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_async.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_async.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_async.Tpo -c -o libcr_la-cr_async.lo `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_la-cr_async.Tpo $(DEPDIR)/libcr_la-cr_async.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_async.c' object='libcr_la-cr_async.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_async.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_async.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_async.lo `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c +- +-libcr_la-cr_core.o: cr_core.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_core.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_core.Tpo" -c -o libcr_la-cr_core.o `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_core.Tpo" "$(DEPDIR)/libcr_la-cr_core.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_core.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_core.c' object='libcr_la-cr_core.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_core.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_core.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_core.o `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c +- +-libcr_la-cr_core.obj: cr_core.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_core.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_core.Tpo" -c -o libcr_la-cr_core.obj `if test -f 'cr_core.c'; then $(CYGPATH_W) 'cr_core.c'; else $(CYGPATH_W) '$(srcdir)/cr_core.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_core.Tpo" "$(DEPDIR)/libcr_la-cr_core.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_core.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_core.c' object='libcr_la-cr_core.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_core.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_core.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_core.obj `if test -f 'cr_core.c'; then $(CYGPATH_W) 'cr_core.c'; else $(CYGPATH_W) '$(srcdir)/cr_core.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_async.lo `test -f 'cr_async.c' || echo '$(srcdir)/'`cr_async.c + + libcr_la-cr_core.lo: cr_core.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_core.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_core.Tpo" -c -o libcr_la-cr_core.lo `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_core.Tpo" "$(DEPDIR)/libcr_la-cr_core.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_core.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_core.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_core.Tpo -c -o libcr_la-cr_core.lo `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_la-cr_core.Tpo $(DEPDIR)/libcr_la-cr_core.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_core.c' object='libcr_la-cr_core.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_core.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_core.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_core.lo `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c +- +-libcr_la-cr_cs.o: cr_cs.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_cs.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_cs.Tpo" -c -o libcr_la-cr_cs.o `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_cs.Tpo" "$(DEPDIR)/libcr_la-cr_cs.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_cs.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_cs.c' object='libcr_la-cr_cs.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_cs.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_cs.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_cs.o `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c +- +-libcr_la-cr_cs.obj: cr_cs.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_cs.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_cs.Tpo" -c -o libcr_la-cr_cs.obj `if test -f 'cr_cs.c'; then $(CYGPATH_W) 'cr_cs.c'; else $(CYGPATH_W) '$(srcdir)/cr_cs.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_cs.Tpo" "$(DEPDIR)/libcr_la-cr_cs.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_cs.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_cs.c' object='libcr_la-cr_cs.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_cs.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_cs.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_cs.obj `if test -f 'cr_cs.c'; then $(CYGPATH_W) 'cr_cs.c'; else $(CYGPATH_W) '$(srcdir)/cr_cs.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_core.lo `test -f 'cr_core.c' || echo '$(srcdir)/'`cr_core.c + + libcr_la-cr_cs.lo: cr_cs.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_cs.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_cs.Tpo" -c -o libcr_la-cr_cs.lo `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_cs.Tpo" "$(DEPDIR)/libcr_la-cr_cs.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_cs.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_cs.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_cs.Tpo -c -o libcr_la-cr_cs.lo `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_la-cr_cs.Tpo $(DEPDIR)/libcr_la-cr_cs.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_cs.c' object='libcr_la-cr_cs.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_cs.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_cs.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_cs.lo `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c +- +-libcr_la-cr_pthread.o: cr_pthread.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_pthread.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_pthread.Tpo" -c -o libcr_la-cr_pthread.o `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo" "$(DEPDIR)/libcr_la-cr_pthread.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_pthread.c' object='libcr_la-cr_pthread.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_pthread.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_pthread.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_pthread.o `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c +- +-libcr_la-cr_pthread.obj: cr_pthread.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_pthread.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_pthread.Tpo" -c -o libcr_la-cr_pthread.obj `if test -f 'cr_pthread.c'; then $(CYGPATH_W) 'cr_pthread.c'; else $(CYGPATH_W) '$(srcdir)/cr_pthread.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo" "$(DEPDIR)/libcr_la-cr_pthread.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_pthread.c' object='libcr_la-cr_pthread.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_pthread.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_pthread.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_pthread.obj `if test -f 'cr_pthread.c'; then $(CYGPATH_W) 'cr_pthread.c'; else $(CYGPATH_W) '$(srcdir)/cr_pthread.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_cs.lo `test -f 'cr_cs.c' || echo '$(srcdir)/'`cr_cs.c + + libcr_la-cr_pthread.lo: cr_pthread.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_pthread.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_pthread.Tpo" -c -o libcr_la-cr_pthread.lo `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo" "$(DEPDIR)/libcr_la-cr_pthread.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_pthread.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_pthread.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_pthread.Tpo -c -o libcr_la-cr_pthread.lo `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_la-cr_pthread.Tpo $(DEPDIR)/libcr_la-cr_pthread.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_pthread.c' object='libcr_la-cr_pthread.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_pthread.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_pthread.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_pthread.lo `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c +- +-libcr_la-cr_sig_sync.o: cr_sig_sync.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_sig_sync.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" -c -o libcr_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_sig_sync.c' object='libcr_la-cr_sig_sync.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c +- +-libcr_la-cr_sig_sync.obj: cr_sig_sync.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_sig_sync.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" -c -o libcr_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_sig_sync.c' object='libcr_la-cr_sig_sync.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_pthread.lo `test -f 'cr_pthread.c' || echo '$(srcdir)/'`cr_pthread.c + + libcr_la-cr_sig_sync.lo: cr_sig_sync.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" -c -o libcr_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_la-cr_sig_sync.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_sig_sync.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_sig_sync.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_sig_sync.Tpo -c -o libcr_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_la-cr_sig_sync.Tpo $(DEPDIR)/libcr_la-cr_sig_sync.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_sig_sync.c' object='libcr_la-cr_sig_sync.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_sig_sync.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_sig_sync.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c +- +-libcr_la-cr_syscall.o: cr_syscall.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_syscall.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_syscall.Tpo" -c -o libcr_la-cr_syscall.o `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo" "$(DEPDIR)/libcr_la-cr_syscall.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_syscall.c' object='libcr_la-cr_syscall.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_syscall.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_syscall.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_syscall.o `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c +- +-libcr_la-cr_syscall.obj: cr_syscall.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_syscall.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_syscall.Tpo" -c -o libcr_la-cr_syscall.obj `if test -f 'cr_syscall.c'; then $(CYGPATH_W) 'cr_syscall.c'; else $(CYGPATH_W) '$(srcdir)/cr_syscall.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo" "$(DEPDIR)/libcr_la-cr_syscall.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_syscall.c' object='libcr_la-cr_syscall.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_syscall.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_syscall.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_syscall.obj `if test -f 'cr_syscall.c'; then $(CYGPATH_W) 'cr_syscall.c'; else $(CYGPATH_W) '$(srcdir)/cr_syscall.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c + + libcr_la-cr_syscall.lo: cr_syscall.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_syscall.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_syscall.Tpo" -c -o libcr_la-cr_syscall.lo `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo" "$(DEPDIR)/libcr_la-cr_syscall.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_syscall.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_syscall.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_syscall.Tpo -c -o libcr_la-cr_syscall.lo `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_la-cr_syscall.Tpo $(DEPDIR)/libcr_la-cr_syscall.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_syscall.c' object='libcr_la-cr_syscall.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_syscall.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_syscall.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_syscall.lo `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c +- +-libcr_la-cr_trace.o: cr_trace.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_trace.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_trace.Tpo" -c -o libcr_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_trace.Tpo" "$(DEPDIR)/libcr_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_trace.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_trace.c' object='libcr_la-cr_trace.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_trace.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c +- +-libcr_la-cr_trace.obj: cr_trace.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_trace.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_trace.Tpo" -c -o libcr_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_trace.Tpo" "$(DEPDIR)/libcr_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_trace.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_trace.c' object='libcr_la-cr_trace.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_trace.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_syscall.lo `test -f 'cr_syscall.c' || echo '$(srcdir)/'`cr_syscall.c + + libcr_la-cr_trace.lo: cr_trace.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_trace.Tpo" -c -o libcr_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_trace.Tpo" "$(DEPDIR)/libcr_la-cr_trace.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_trace.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_trace.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_trace.Tpo -c -o libcr_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_la-cr_trace.Tpo $(DEPDIR)/libcr_la-cr_trace.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_trace.c' object='libcr_la-cr_trace.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_trace.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_trace.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c +- +-libcr_la-cr_strerror.o: cr_strerror.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_strerror.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_strerror.Tpo" -c -o libcr_la-cr_strerror.o `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo" "$(DEPDIR)/libcr_la-cr_strerror.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_strerror.c' object='libcr_la-cr_strerror.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_strerror.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_strerror.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_strerror.o `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c +- +-libcr_la-cr_strerror.obj: cr_strerror.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_strerror.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_strerror.Tpo" -c -o libcr_la-cr_strerror.obj `if test -f 'cr_strerror.c'; then $(CYGPATH_W) 'cr_strerror.c'; else $(CYGPATH_W) '$(srcdir)/cr_strerror.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo" "$(DEPDIR)/libcr_la-cr_strerror.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_strerror.c' object='libcr_la-cr_strerror.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_strerror.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_strerror.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_strerror.obj `if test -f 'cr_strerror.c'; then $(CYGPATH_W) 'cr_strerror.c'; else $(CYGPATH_W) '$(srcdir)/cr_strerror.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c + + libcr_la-cr_strerror.lo: cr_strerror.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_strerror.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_strerror.Tpo" -c -o libcr_la-cr_strerror.lo `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo" "$(DEPDIR)/libcr_la-cr_strerror.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_strerror.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_strerror.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_strerror.Tpo -c -o libcr_la-cr_strerror.lo `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_la-cr_strerror.Tpo $(DEPDIR)/libcr_la-cr_strerror.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_strerror.c' object='libcr_la-cr_strerror.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_strerror.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_strerror.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_strerror.lo `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c +- +-libcr_la-cr_request.o: cr_request.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_request.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_request.Tpo" -c -o libcr_la-cr_request.o `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_request.Tpo" "$(DEPDIR)/libcr_la-cr_request.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_request.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_request.c' object='libcr_la-cr_request.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_request.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_request.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_request.o `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c +- +-libcr_la-cr_request.obj: cr_request.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_request.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_request.Tpo" -c -o libcr_la-cr_request.obj `if test -f 'cr_request.c'; then $(CYGPATH_W) 'cr_request.c'; else $(CYGPATH_W) '$(srcdir)/cr_request.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_request.Tpo" "$(DEPDIR)/libcr_la-cr_request.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_request.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_request.c' object='libcr_la-cr_request.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_request.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_request.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_request.obj `if test -f 'cr_request.c'; then $(CYGPATH_W) 'cr_request.c'; else $(CYGPATH_W) '$(srcdir)/cr_request.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_strerror.lo `test -f 'cr_strerror.c' || echo '$(srcdir)/'`cr_strerror.c + + libcr_la-cr_request.lo: cr_request.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_request.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_request.Tpo" -c -o libcr_la-cr_request.lo `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_request.Tpo" "$(DEPDIR)/libcr_la-cr_request.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_request.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_request.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_request.Tpo -c -o libcr_la-cr_request.lo `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_la-cr_request.Tpo $(DEPDIR)/libcr_la-cr_request.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_request.c' object='libcr_la-cr_request.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_request.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_request.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_request.lo `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c +- +-libcr_la-cr_omit.o: cr_omit.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_omit.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_omit.Tpo" -c -o libcr_la-cr_omit.o `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_omit.Tpo" "$(DEPDIR)/libcr_la-cr_omit.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_omit.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_omit.c' object='libcr_la-cr_omit.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_omit.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_omit.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_omit.o `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c +- +-libcr_la-cr_omit.obj: cr_omit.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_omit.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_omit.Tpo" -c -o libcr_la-cr_omit.obj `if test -f 'cr_omit.c'; then $(CYGPATH_W) 'cr_omit.c'; else $(CYGPATH_W) '$(srcdir)/cr_omit.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_omit.Tpo" "$(DEPDIR)/libcr_la-cr_omit.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_omit.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_omit.c' object='libcr_la-cr_omit.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_omit.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_omit.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_omit.obj `if test -f 'cr_omit.c'; then $(CYGPATH_W) 'cr_omit.c'; else $(CYGPATH_W) '$(srcdir)/cr_omit.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_request.lo `test -f 'cr_request.c' || echo '$(srcdir)/'`cr_request.c + + libcr_la-cr_omit.lo: cr_omit.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_omit.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_omit.Tpo" -c -o libcr_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_omit.Tpo" "$(DEPDIR)/libcr_la-cr_omit.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_omit.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_omit.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_omit.Tpo -c -o libcr_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_la-cr_omit.Tpo $(DEPDIR)/libcr_la-cr_omit.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_omit.c' object='libcr_la-cr_omit.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_omit.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_omit.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c +- +-libcr_la-cr_run.o: cr_run.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_run.o -MD -MP -MF "$(DEPDIR)/libcr_la-cr_run.Tpo" -c -o libcr_la-cr_run.o `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_run.Tpo" "$(DEPDIR)/libcr_la-cr_run.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_run.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_run.c' object='libcr_la-cr_run.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_run.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_run.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_run.o `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c +- +-libcr_la-cr_run.obj: cr_run.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_run.obj -MD -MP -MF "$(DEPDIR)/libcr_la-cr_run.Tpo" -c -o libcr_la-cr_run.obj `if test -f 'cr_run.c'; then $(CYGPATH_W) 'cr_run.c'; else $(CYGPATH_W) '$(srcdir)/cr_run.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_run.Tpo" "$(DEPDIR)/libcr_la-cr_run.Po"; else rm -f "$(DEPDIR)/libcr_la-cr_run.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_run.c' object='libcr_la-cr_run.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_run.Po' tmpdepfile='$(DEPDIR)/libcr_la-cr_run.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_run.obj `if test -f 'cr_run.c'; then $(CYGPATH_W) 'cr_run.c'; else $(CYGPATH_W) '$(srcdir)/cr_run.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c + + libcr_la-cr_run.lo: cr_run.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_run.lo -MD -MP -MF "$(DEPDIR)/libcr_la-cr_run.Tpo" -c -o libcr_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_la-cr_run.Tpo" "$(DEPDIR)/libcr_la-cr_run.Plo"; else rm -f "$(DEPDIR)/libcr_la-cr_run.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -MT libcr_la-cr_run.lo -MD -MP -MF $(DEPDIR)/libcr_la-cr_run.Tpo -c -o libcr_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_la-cr_run.Tpo $(DEPDIR)/libcr_la-cr_run.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_run.c' object='libcr_la-cr_run.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_la-cr_run.Plo' tmpdepfile='$(DEPDIR)/libcr_la-cr_run.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c +- +-libcr_omit_la-cr_omit.o: cr_omit.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_omit.o -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" -c -o libcr_omit_la-cr_omit.o `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" "$(DEPDIR)/libcr_omit_la-cr_omit.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_omit.c' object='libcr_omit_la-cr_omit.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_omit_la-cr_omit.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_omit.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_omit.o `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c +- +-libcr_omit_la-cr_omit.obj: cr_omit.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_omit.obj -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" -c -o libcr_omit_la-cr_omit.obj `if test -f 'cr_omit.c'; then $(CYGPATH_W) 'cr_omit.c'; else $(CYGPATH_W) '$(srcdir)/cr_omit.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" "$(DEPDIR)/libcr_omit_la-cr_omit.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_omit.c' object='libcr_omit_la-cr_omit.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_omit_la-cr_omit.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_omit.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_omit.obj `if test -f 'cr_omit.c'; then $(CYGPATH_W) 'cr_omit.c'; else $(CYGPATH_W) '$(srcdir)/cr_omit.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_la_CFLAGS) $(CFLAGS) -c -o libcr_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c + + libcr_omit_la-cr_omit.lo: cr_omit.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_omit.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" -c -o libcr_omit_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo" "$(DEPDIR)/libcr_omit_la-cr_omit.Plo"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_omit.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_omit.lo -MD -MP -MF $(DEPDIR)/libcr_omit_la-cr_omit.Tpo -c -o libcr_omit_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_omit_la-cr_omit.Tpo $(DEPDIR)/libcr_omit_la-cr_omit.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_omit.c' object='libcr_omit_la-cr_omit.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_omit_la-cr_omit.Plo' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_omit.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c +- +-libcr_omit_la-cr_trace.o: cr_trace.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_trace.o -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" -c -o libcr_omit_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" "$(DEPDIR)/libcr_omit_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_trace.c' object='libcr_omit_la-cr_trace.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_omit_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_trace.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c +- +-libcr_omit_la-cr_trace.obj: cr_trace.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_trace.obj -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" -c -o libcr_omit_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" "$(DEPDIR)/libcr_omit_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_trace.c' object='libcr_omit_la-cr_trace.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_omit_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_trace.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_omit.lo `test -f 'cr_omit.c' || echo '$(srcdir)/'`cr_omit.c + + libcr_omit_la-cr_trace.lo: cr_trace.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" -c -o libcr_omit_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo" "$(DEPDIR)/libcr_omit_la-cr_trace.Plo"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_trace.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_trace.lo -MD -MP -MF $(DEPDIR)/libcr_omit_la-cr_trace.Tpo -c -o libcr_omit_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_omit_la-cr_trace.Tpo $(DEPDIR)/libcr_omit_la-cr_trace.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_trace.c' object='libcr_omit_la-cr_trace.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_omit_la-cr_trace.Plo' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_trace.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c +- +-libcr_omit_la-cr_sig_sync.o: cr_sig_sync.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_sig_sync.o -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" -c -o libcr_omit_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_sig_sync.c' object='libcr_omit_la-cr_sig_sync.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c +- +-libcr_omit_la-cr_sig_sync.obj: cr_sig_sync.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_sig_sync.obj -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" -c -o libcr_omit_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_sig_sync.c' object='libcr_omit_la-cr_sig_sync.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c + + libcr_omit_la-cr_sig_sync.lo: cr_sig_sync.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" -c -o libcr_omit_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Plo"; else rm -f "$(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -MT libcr_omit_la-cr_sig_sync.lo -MD -MP -MF $(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo -c -o libcr_omit_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_omit_la-cr_sig_sync.Tpo $(DEPDIR)/libcr_omit_la-cr_sig_sync.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_sig_sync.c' object='libcr_omit_la-cr_sig_sync.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.Plo' tmpdepfile='$(DEPDIR)/libcr_omit_la-cr_sig_sync.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c +- +-libcr_run_la-cr_run.o: cr_run.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_run.o -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_run.Tpo" -c -o libcr_run_la-cr_run.o `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo" "$(DEPDIR)/libcr_run_la-cr_run.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_run.c' object='libcr_run_la-cr_run.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_run_la-cr_run.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_run.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_run.o `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c +- +-libcr_run_la-cr_run.obj: cr_run.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_run.obj -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_run.Tpo" -c -o libcr_run_la-cr_run.obj `if test -f 'cr_run.c'; then $(CYGPATH_W) 'cr_run.c'; else $(CYGPATH_W) '$(srcdir)/cr_run.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo" "$(DEPDIR)/libcr_run_la-cr_run.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_run.c' object='libcr_run_la-cr_run.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_run_la-cr_run.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_run.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_run.obj `if test -f 'cr_run.c'; then $(CYGPATH_W) 'cr_run.c'; else $(CYGPATH_W) '$(srcdir)/cr_run.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_omit_la_CFLAGS) $(CFLAGS) -c -o libcr_omit_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c + + libcr_run_la-cr_run.lo: cr_run.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_run.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_run.Tpo" -c -o libcr_run_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo" "$(DEPDIR)/libcr_run_la-cr_run.Plo"; else rm -f "$(DEPDIR)/libcr_run_la-cr_run.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_run.lo -MD -MP -MF $(DEPDIR)/libcr_run_la-cr_run.Tpo -c -o libcr_run_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_run_la-cr_run.Tpo $(DEPDIR)/libcr_run_la-cr_run.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_run.c' object='libcr_run_la-cr_run.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_run_la-cr_run.Plo' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_run.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c +- +-libcr_run_la-cr_trace.o: cr_trace.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_trace.o -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" -c -o libcr_run_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" "$(DEPDIR)/libcr_run_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_trace.c' object='libcr_run_la-cr_trace.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_run_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_trace.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_trace.o `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c +- +-libcr_run_la-cr_trace.obj: cr_trace.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_trace.obj -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" -c -o libcr_run_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" "$(DEPDIR)/libcr_run_la-cr_trace.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_trace.c' object='libcr_run_la-cr_trace.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_run_la-cr_trace.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_trace.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_trace.obj `if test -f 'cr_trace.c'; then $(CYGPATH_W) 'cr_trace.c'; else $(CYGPATH_W) '$(srcdir)/cr_trace.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_run.lo `test -f 'cr_run.c' || echo '$(srcdir)/'`cr_run.c + + libcr_run_la-cr_trace.lo: cr_trace.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_trace.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" -c -o libcr_run_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo" "$(DEPDIR)/libcr_run_la-cr_trace.Plo"; else rm -f "$(DEPDIR)/libcr_run_la-cr_trace.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_trace.lo -MD -MP -MF $(DEPDIR)/libcr_run_la-cr_trace.Tpo -c -o libcr_run_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_run_la-cr_trace.Tpo $(DEPDIR)/libcr_run_la-cr_trace.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_trace.c' object='libcr_run_la-cr_trace.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_run_la-cr_trace.Plo' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_trace.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c +- +-libcr_run_la-cr_sig_sync.o: cr_sig_sync.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_sig_sync.o -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" -c -o libcr_run_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_run_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_sig_sync.c' object='libcr_run_la-cr_sig_sync.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_sig_sync.o `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c +- +-libcr_run_la-cr_sig_sync.obj: cr_sig_sync.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_sig_sync.obj -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" -c -o libcr_run_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_run_la-cr_sig_sync.Po"; else rm -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_sig_sync.c' object='libcr_run_la-cr_sig_sync.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.Po' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_sig_sync.obj `if test -f 'cr_sig_sync.c'; then $(CYGPATH_W) 'cr_sig_sync.c'; else $(CYGPATH_W) '$(srcdir)/cr_sig_sync.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_trace.lo `test -f 'cr_trace.c' || echo '$(srcdir)/'`cr_trace.c + + libcr_run_la-cr_sig_sync.lo: cr_sig_sync.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_sig_sync.lo -MD -MP -MF "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" -c -o libcr_run_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo" "$(DEPDIR)/libcr_run_la-cr_sig_sync.Plo"; else rm -f "$(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -MT libcr_run_la-cr_sig_sync.lo -MD -MP -MF $(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo -c -o libcr_run_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcr_run_la-cr_sig_sync.Tpo $(DEPDIR)/libcr_run_la-cr_sig_sync.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cr_sig_sync.c' object='libcr_run_la-cr_sig_sync.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.Plo' tmpdepfile='$(DEPDIR)/libcr_run_la-cr_sig_sync.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcr_run_la_CFLAGS) $(CFLAGS) -c -o libcr_run_la-cr_sig_sync.lo `test -f 'cr_sig_sync.c' || echo '$(srcdir)/'`cr_sig_sync.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -906,80 +588,85 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -991,7 +678,7 @@ + all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local + installdirs: + for dir in "$(DESTDIR)$(libdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -1012,7 +699,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -1026,7 +714,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -1034,18 +722,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: install-libLTLIBRARIES + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -1066,20 +774,23 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES ++uninstall-am: uninstall-libLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ + clean-generic clean-libLTLIBRARIES clean-libtool ctags \ +- distclean distclean-compile distclean-generic \ ++ dist-hook distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-libLTLIBRARIES install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags uninstall uninstall-am \ +- uninstall-info-am uninstall-libLTLIBRARIES ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-libLTLIBRARIES install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-libLTLIBRARIES + + + # XXX: should split off arch-specific portions of the symbol filter +@@ -1092,6 +803,7 @@ + find $(distdir)/arch -name CVS | xargs rm -rf + all-local: $(cr_lib_check) + if test -d $(top_builddir)/libcr32/libcr; then $(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/libcr32/libcr all; fi ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 libcr/arch/arm/cr_atomic.h +--- a/libcr/arch/arm/cr_atomic.h Sun Apr 11 12:41:30 2010 +0200 ++++ b/libcr/arch/arm/cr_atomic.h Sun Apr 11 16:31:36 2010 +0200 +@@ -33,6 +33,25 @@ + #ifndef _CR_ATOMIC_H + #define _CR_ATOMIC_H 1 + ++#if defined(__ARM_ARCH_2__) || defined(__ARM_ARCH_3__) ++ // Sanity-check that we're not building on a really old architecture, ++ // so that the using #ifdef __ARM_ARCH_4__ works to test for ++ // lack of blx support. ++ #error "ARM Architecture versions prior to ARMv4 not supported." ++#elif defined(__ARM_ARCH_4T__) && defined(__thumb__) ++ // The inline asm is not compatible with Thumb-1 anyway, but in particular ++ // we assume later that if __ARM_ARCH_4__ is not defined, we have ARMv5 ++ // or above. Ensure here that this assumption will be valid. ++ #error "Building for Thumb on ARMv4 is not supported." ++#endif ++ ++// Determine whether to use BLX for function calls to ++// computed addresses: ++#undef ARM_HAVE_BLX_REG ++#if !(defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)) ++ #define ARM_HAVE_BLX_REG 1 ++#endif ++ + #include "blcr_config.h" + + #ifndef _STRINGIFY +@@ -61,7 +80,7 @@ + __asm__ __volatile__("": : :"memory"); + } + +-#if defined(CR_KCODE___kuser_cmpxchg) ++#if 1 + // For kernel >= 2.6.12, we use __kernel_cmpxchg() + // See linux-2.6.12/arch/arm/kernel/entry-armv.S + // For >= ARM6 we could/should be using load-exclusive directly. +@@ -83,10 +102,15 @@ + + __asm__ __volatile__ ( + "0: ldr r0, [r2] @ r0 = *p \n" ++ " add r1, r0, %2 @ r1 = r0 + op \n" + " mov r3, #" _STRINGIFY(cri_kuser_base) " \n" ++#ifdef ARM_HAVE_BLX_REG ++ " sub r3, r3, #" _STRINGIFY(cri_kuser_offset) "\n" ++ " blx r3\n" ++#else // ARMv4T and below + " adr lr, 1f @ lr = return address \n" +- " add r1, r0, %2 @ r1 = r0 + op \n" + " sub pc, r3, #" _STRINGIFY(cri_kuser_offset) "\n" ++#endif + "1: bcc 0b @ retry on Carry Clear" + : "=&r" (__sum) + : "r" (__ptr), "rIL" (op) +@@ -135,9 +159,14 @@ + __asm__ __volatile__ ( + "0: mov r0, r4 @ r0 = oldval \n" + " mov r3, #" _STRINGIFY(cri_kuser_base) " \n" +- " mov lr, pc @ lr = return addr \n" ++#ifdef ARM_HAVE_BLX_REG ++ " sub r3, r3, #" _STRINGIFY(cri_kuser_offset) "\n" ++ " blx r3\n" ++#else // ARMv4T and below ++ " adr lr, 1f @ lr = return addr \n" + " sub pc, r3, #" _STRINGIFY(cri_kuser_offset) "\n" +- " ldrcc ip, [r2] @ if (!swapped) ip=*p \n" ++#endif ++ "1: ldrcc ip, [r2] @ if (!swapped) ip=*p \n" + " eorcs ip, r4, #1 @ else ip=oldval^1 \n" + " teq r4, ip @ if (ip == oldval) \n" + " beq 0b @ then retry " +diff -r 3c8a74e0c599 man/Makefile.in +--- a/man/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/man/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -13,15 +14,12 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -33,6 +31,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + subdir = man + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -41,79 +40,35 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -134,20 +89,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -155,12 +110,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -174,86 +128,107 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + EXTRA_DIST = help2man license.txt + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign man/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign man/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -267,20 +242,17 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -289,29 +261,32 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -338,7 +313,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -349,7 +325,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -357,18 +333,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -387,17 +383,21 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -r 3c8a74e0c599 rpm/Makefile.in +--- a/rpm/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/rpm/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -13,15 +14,12 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -33,6 +31,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + subdir = rpm + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +@@ -42,79 +41,35 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = specfile ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -135,20 +90,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -156,12 +111,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -175,70 +129,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + + # To get a spec file w/ the version in it, we copy 'specfile' to the final name + # This is also our chance to substitute in an RPM release number and a date. +@@ -257,18 +232,18 @@ + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign rpm/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign rpm/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign rpm/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign rpm/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -282,10 +257,11 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + specfile: $(top_builddir)/config.status $(srcdir)/specfile.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +@@ -294,10 +270,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -306,29 +278,32 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -356,18 +331,20 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." ++@HAVE_RPMBUILD_FALSE@clean-local: + clean: clean-am + + clean-am: clean-generic clean-libtool clean-local mostlyclean-am + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -375,18 +352,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -405,17 +402,21 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ +- install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ ++ install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am ++ uninstall uninstall-am + + $(RPM_SPECFILE): specfile + @PERL@ -pe 's|\@rpm_release\@|$(RPM_RELEASE)|;' \ +@@ -452,6 +453,7 @@ + @HAVE_RPMBUILD_FALSE@ @echo "===========================================" + @HAVE_RPMBUILD_FALSE@distcheck-hook: + @HAVE_RPMBUILD_FALSE@ @true ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 tests/Makefile.in +--- a/tests/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/tests/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -15,17 +16,12 @@ + @SET_MAKE@ + + +-SOURCES = $(libtest_a_SOURCES) atomics.c atomics_stress.c bug2003_aux.c bug2524.c cb_exit.c child.c cloexec.c cr_signal.c cr_tryenter_cs.c critical_sections.c crut_wrapper.c cs_enter_leave.c cs_enter_leave2.c cwd.c dev_null.c dlopen_aux.c dpipe.c dup.c edeadlk.c failed_cb.c failed_cb2.c filedescriptors.c forward.c get_info.c hello.c hooks.c hugetlbfs.c hugetlbfs2.c lam.c linked_fifo.c math.c mmaps.c named_fifo.c orphan.c overlap.c pause.c pid_in_use.c pid_restore.c pipe.c prctl.c ptrace.c readdir.c reloc_aux.c replace_cb.c save_aux.c seq_wrapper.c sigaltstack.c sigpending.c simple.c simple_pthread.c stage0001.c stage0002.c stage0003.c stage0004.c stopped.c $(testcxx_SOURCES) +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +33,12 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + @CR_BUILD_TESTSUITE_TRUE@testsexec_PROGRAMS = $(am__EXEEXT_6) \ + @CR_BUILD_TESTSUITE_TRUE@ $(am__EXEEXT_14) + check_PROGRAMS = $(am__EXEEXT_7) $(am__EXEEXT_13) $(am__EXEEXT_14) ++TESTS = $(am__EXEEXT_15) $(SEQ_RUN) $(CRUT_RUN) + subdir = tests + DIST_COMMON = $(check_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/shellinit.in +@@ -49,9 +47,10 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = shellinit ++CONFIG_CLEAN_VPATH_FILES = + ARFLAGS = cru + libtest_a_AR = $(AR) $(ARFLAGS) + libtest_a_LIBADD = +@@ -89,298 +88,297 @@ + am__EXEEXT_13 = $(am__EXEEXT_8) $(am__EXEEXT_10) $(am__EXEEXT_11) \ + $(am__EXEEXT_12) + am__EXEEXT_14 = seq_wrapper$(EXEEXT) crut_wrapper$(EXEEXT) +-am__installdirs = "$(DESTDIR)$(testsexecdir)" "$(DESTDIR)$(testsexecdir)" +-testsexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++am__installdirs = "$(DESTDIR)$(testsexecdir)" \ ++ "$(DESTDIR)$(testsexecdir)" + PROGRAMS = $(testsexec_PROGRAMS) + atomics_SOURCES = atomics.c + atomics_OBJECTS = atomics-atomics.$(OBJEXT) + atomics_DEPENDENCIES = ++atomics_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(atomics_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + atomics_stress_SOURCES = atomics_stress.c + atomics_stress_OBJECTS = atomics_stress-atomics_stress.$(OBJEXT) +-am__DEPENDENCIES_1 = libtest.a +-atomics_stress_DEPENDENCIES = $(am__DEPENDENCIES_1) ++atomics_stress_DEPENDENCIES = $(libtest_ldadd) ++atomics_stress_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(atomics_stress_CFLAGS) \ ++ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + bug2003_aux_SOURCES = bug2003_aux.c + bug2003_aux_OBJECTS = bug2003_aux.$(OBJEXT) +-am__DEPENDENCIES_2 = +-am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) ++am__DEPENDENCIES_1 = ++am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) + @CR_ENABLE_SHARED_FALSE@bug2003_aux_DEPENDENCIES = \ +-@CR_ENABLE_SHARED_FALSE@ $(am__DEPENDENCIES_3) ++@CR_ENABLE_SHARED_FALSE@ $(am__DEPENDENCIES_2) ++bug2003_aux_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(bug2003_aux_LDFLAGS) $(LDFLAGS) -o $@ + bug2524_SOURCES = bug2524.c + bug2524_OBJECTS = bug2524.$(OBJEXT) + bug2524_LDADD = $(LDADD) +-bug2524_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++bug2524_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + cb_exit_SOURCES = cb_exit.c + cb_exit_OBJECTS = cb_exit.$(OBJEXT) + cb_exit_LDADD = $(LDADD) +-cb_exit_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++cb_exit_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + child_SOURCES = child.c + child_OBJECTS = child.$(OBJEXT) + child_LDADD = $(LDADD) +-child_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++child_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + cloexec_SOURCES = cloexec.c + cloexec_OBJECTS = cloexec.$(OBJEXT) + cloexec_LDADD = $(LDADD) +-cloexec_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++cloexec_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + cr_signal_SOURCES = cr_signal.c + cr_signal_OBJECTS = cr_signal.$(OBJEXT) + cr_signal_LDADD = $(LDADD) +-cr_signal_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++cr_signal_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + cr_tryenter_cs_SOURCES = cr_tryenter_cs.c + cr_tryenter_cs_OBJECTS = cr_tryenter_cs.$(OBJEXT) + cr_tryenter_cs_LDADD = $(LDADD) +-cr_tryenter_cs_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_3) ++cr_tryenter_cs_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + critical_sections_SOURCES = critical_sections.c + critical_sections_OBJECTS = critical_sections.$(OBJEXT) + critical_sections_LDADD = $(LDADD) +-critical_sections_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_3) ++critical_sections_DEPENDENCIES = $(libtest_ldadd) \ ++ $(am__DEPENDENCIES_2) + crut_wrapper_SOURCES = crut_wrapper.c + crut_wrapper_OBJECTS = crut_wrapper.$(OBJEXT) + crut_wrapper_LDADD = $(LDADD) +-crut_wrapper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_3) ++crut_wrapper_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + cs_enter_leave_SOURCES = cs_enter_leave.c + cs_enter_leave_OBJECTS = cs_enter_leave.$(OBJEXT) + cs_enter_leave_LDADD = $(LDADD) +-cs_enter_leave_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_3) ++cs_enter_leave_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + cs_enter_leave2_SOURCES = cs_enter_leave2.c + cs_enter_leave2_OBJECTS = cs_enter_leave2.$(OBJEXT) + cs_enter_leave2_LDADD = $(LDADD) +-cs_enter_leave2_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_3) ++cs_enter_leave2_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + cwd_SOURCES = cwd.c + cwd_OBJECTS = cwd.$(OBJEXT) + cwd_LDADD = $(LDADD) +-cwd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++cwd_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + dev_null_SOURCES = dev_null.c + dev_null_OBJECTS = dev_null.$(OBJEXT) + dev_null_LDADD = $(LDADD) +-dev_null_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++dev_null_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + dlopen_aux_SOURCES = dlopen_aux.c + dlopen_aux_OBJECTS = dlopen_aux.$(OBJEXT) + dlopen_aux_DEPENDENCIES = + dpipe_SOURCES = dpipe.c + dpipe_OBJECTS = dpipe.$(OBJEXT) + dpipe_LDADD = $(LDADD) +-dpipe_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++dpipe_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + dup_SOURCES = dup.c + dup_OBJECTS = dup.$(OBJEXT) + dup_LDADD = $(LDADD) +-dup_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++dup_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + edeadlk_SOURCES = edeadlk.c + edeadlk_OBJECTS = edeadlk.$(OBJEXT) + edeadlk_LDADD = $(LDADD) +-edeadlk_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++edeadlk_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + failed_cb_SOURCES = failed_cb.c + failed_cb_OBJECTS = failed_cb.$(OBJEXT) + failed_cb_LDADD = $(LDADD) +-failed_cb_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++failed_cb_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + failed_cb2_SOURCES = failed_cb2.c + failed_cb2_OBJECTS = failed_cb2.$(OBJEXT) + failed_cb2_LDADD = $(LDADD) +-failed_cb2_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++failed_cb2_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + filedescriptors_SOURCES = filedescriptors.c + filedescriptors_OBJECTS = filedescriptors.$(OBJEXT) + filedescriptors_LDADD = $(LDADD) +-filedescriptors_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_3) ++filedescriptors_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + forward_SOURCES = forward.c + forward_OBJECTS = forward.$(OBJEXT) + forward_LDADD = $(LDADD) +-forward_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++forward_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + get_info_SOURCES = get_info.c + get_info_OBJECTS = get_info.$(OBJEXT) + get_info_LDADD = $(LDADD) +-get_info_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++get_info_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + hello_SOURCES = hello.c + hello_OBJECTS = hello.$(OBJEXT) + hello_DEPENDENCIES = + hooks_SOURCES = hooks.c + hooks_OBJECTS = hooks.$(OBJEXT) + hooks_LDADD = $(LDADD) +-hooks_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++hooks_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + hugetlbfs_SOURCES = hugetlbfs.c + hugetlbfs_OBJECTS = hugetlbfs.$(OBJEXT) + hugetlbfs_LDADD = $(LDADD) +-hugetlbfs_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++hugetlbfs_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + hugetlbfs2_SOURCES = hugetlbfs2.c + hugetlbfs2_OBJECTS = hugetlbfs2.$(OBJEXT) + hugetlbfs2_LDADD = $(LDADD) +-hugetlbfs2_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++hugetlbfs2_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + lam_SOURCES = lam.c + lam_OBJECTS = lam.$(OBJEXT) + lam_LDADD = $(LDADD) +-lam_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++lam_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + linked_fifo_SOURCES = linked_fifo.c + linked_fifo_OBJECTS = linked_fifo.$(OBJEXT) + linked_fifo_LDADD = $(LDADD) +-linked_fifo_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++linked_fifo_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + math_SOURCES = math.c + math_OBJECTS = math.$(OBJEXT) + math_LDADD = $(LDADD) +-math_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++math_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + mmaps_SOURCES = mmaps.c + mmaps_OBJECTS = mmaps.$(OBJEXT) + mmaps_LDADD = $(LDADD) +-mmaps_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++mmaps_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + named_fifo_SOURCES = named_fifo.c + named_fifo_OBJECTS = named_fifo.$(OBJEXT) + named_fifo_LDADD = $(LDADD) +-named_fifo_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++named_fifo_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + orphan_SOURCES = orphan.c + orphan_OBJECTS = orphan.$(OBJEXT) + orphan_LDADD = $(LDADD) +-orphan_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++orphan_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + overlap_SOURCES = overlap.c + overlap_OBJECTS = overlap.$(OBJEXT) + overlap_LDADD = $(LDADD) +-overlap_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++overlap_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + pause_SOURCES = pause.c + pause_OBJECTS = pause.$(OBJEXT) +-@CR_ENABLE_SHARED_FALSE@pause_DEPENDENCIES = $(am__DEPENDENCIES_3) ++@CR_ENABLE_SHARED_FALSE@pause_DEPENDENCIES = $(am__DEPENDENCIES_2) ++pause_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(pause_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + pid_in_use_SOURCES = pid_in_use.c + pid_in_use_OBJECTS = pid_in_use.$(OBJEXT) + pid_in_use_LDADD = $(LDADD) +-pid_in_use_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++pid_in_use_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + pid_restore_SOURCES = pid_restore.c + pid_restore_OBJECTS = pid_restore.$(OBJEXT) + pid_restore_LDADD = $(LDADD) +-pid_restore_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++pid_restore_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + pipe_SOURCES = pipe.c + pipe_OBJECTS = pipe.$(OBJEXT) + pipe_LDADD = $(LDADD) +-pipe_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++pipe_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + prctl_SOURCES = prctl.c + prctl_OBJECTS = prctl.$(OBJEXT) + prctl_LDADD = $(LDADD) +-prctl_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++prctl_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + ptrace_SOURCES = ptrace.c + ptrace_OBJECTS = ptrace.$(OBJEXT) + ptrace_LDADD = $(LDADD) +-ptrace_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++ptrace_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) ++ptrace_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ptrace_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + readdir_SOURCES = readdir.c + readdir_OBJECTS = readdir.$(OBJEXT) + readdir_LDADD = $(LDADD) +-readdir_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++readdir_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + reloc_aux_SOURCES = reloc_aux.c + reloc_aux_OBJECTS = reloc_aux.$(OBJEXT) + @CR_ENABLE_SHARED_FALSE@reloc_aux_DEPENDENCIES = \ +-@CR_ENABLE_SHARED_FALSE@ $(am__DEPENDENCIES_3) \ +-@CR_ENABLE_SHARED_FALSE@ $(am__DEPENDENCIES_1) +-@CR_ENABLE_SHARED_TRUE@reloc_aux_DEPENDENCIES = $(am__DEPENDENCIES_1) ++@CR_ENABLE_SHARED_FALSE@ $(am__DEPENDENCIES_2) $(libtest_ldadd) ++@CR_ENABLE_SHARED_TRUE@reloc_aux_DEPENDENCIES = $(libtest_ldadd) ++reloc_aux_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(reloc_aux_LDFLAGS) $(LDFLAGS) -o $@ + replace_cb_SOURCES = replace_cb.c + replace_cb_OBJECTS = replace_cb.$(OBJEXT) + replace_cb_LDADD = $(LDADD) +-replace_cb_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++replace_cb_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + save_aux_SOURCES = save_aux.c + save_aux_OBJECTS = save_aux.$(OBJEXT) +-@CR_ENABLE_SHARED_FALSE@save_aux_DEPENDENCIES = $(am__DEPENDENCIES_3) \ +-@CR_ENABLE_SHARED_FALSE@ $(am__DEPENDENCIES_1) +-@CR_ENABLE_SHARED_TRUE@save_aux_DEPENDENCIES = $(am__DEPENDENCIES_1) ++@CR_ENABLE_SHARED_FALSE@save_aux_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@CR_ENABLE_SHARED_FALSE@ $(libtest_ldadd) ++@CR_ENABLE_SHARED_TRUE@save_aux_DEPENDENCIES = $(libtest_ldadd) ++save_aux_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(save_aux_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + seq_wrapper_SOURCES = seq_wrapper.c + seq_wrapper_OBJECTS = seq_wrapper.$(OBJEXT) +-seq_wrapper_DEPENDENCIES = $(am__DEPENDENCIES_1) ++seq_wrapper_DEPENDENCIES = $(libtest_ldadd) + sigaltstack_SOURCES = sigaltstack.c + sigaltstack_OBJECTS = sigaltstack.$(OBJEXT) + sigaltstack_LDADD = $(LDADD) +-sigaltstack_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++sigaltstack_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + sigpending_SOURCES = sigpending.c + sigpending_OBJECTS = sigpending.$(OBJEXT) + sigpending_LDADD = $(LDADD) +-sigpending_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++sigpending_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + simple_SOURCES = simple.c + simple_OBJECTS = simple.$(OBJEXT) + simple_LDADD = $(LDADD) +-simple_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++simple_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + simple_pthread_SOURCES = simple_pthread.c + simple_pthread_OBJECTS = simple_pthread.$(OBJEXT) + simple_pthread_LDADD = $(LDADD) +-simple_pthread_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_3) ++simple_pthread_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + stage0001_SOURCES = stage0001.c + stage0001_OBJECTS = stage0001.$(OBJEXT) +-stage0001_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++stage0001_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + stage0002_SOURCES = stage0002.c + stage0002_OBJECTS = stage0002.$(OBJEXT) + stage0002_LDADD = $(LDADD) +-stage0002_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++stage0002_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + stage0003_SOURCES = stage0003.c + stage0003_OBJECTS = stage0003.$(OBJEXT) + stage0003_LDADD = $(LDADD) +-stage0003_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++stage0003_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + stage0004_SOURCES = stage0004.c + stage0004_OBJECTS = stage0004.$(OBJEXT) + stage0004_LDADD = $(LDADD) +-stage0004_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++stage0004_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + stopped_SOURCES = stopped.c + stopped_OBJECTS = stopped.$(OBJEXT) + stopped_LDADD = $(LDADD) +-stopped_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) ++stopped_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) + am__testcxx_SOURCES_DIST = testcxx.cc + @CR_HAVE_CXX_TRUE@am_testcxx_OBJECTS = testcxx.$(OBJEXT) + testcxx_OBJECTS = $(am_testcxx_OBJECTS) + testcxx_LDADD = $(LDADD) +-testcxx_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) +-testsexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++testcxx_DEPENDENCIES = $(libtest_ldadd) $(am__DEPENDENCIES_2) ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + SCRIPTS = $(testsexec_SCRIPTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/./config/depcomp + am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/atomics-atomics.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/atomics_stress-atomics_stress.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/bug2003_aux.Po ./$(DEPDIR)/bug2524.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/cb_exit.Po ./$(DEPDIR)/child.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/cloexec.Po ./$(DEPDIR)/cr_signal.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/cr_tryenter_cs.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/critical_sections.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/crut.Po ./$(DEPDIR)/crut_util.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/crut_util_libcr.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/crut_util_pth.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/crut_wrapper.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/cs_enter_leave.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/cs_enter_leave2.Po ./$(DEPDIR)/cwd.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/dev_null.Po ./$(DEPDIR)/dlopen_aux.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/dpipe.Po ./$(DEPDIR)/dup.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/edeadlk.Po ./$(DEPDIR)/failed_cb.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/failed_cb2.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/filedescriptors.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/forward.Po ./$(DEPDIR)/get_info.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/hello.Po ./$(DEPDIR)/hooks.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/hugetlbfs.Po ./$(DEPDIR)/hugetlbfs2.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/lam.Po ./$(DEPDIR)/linked_fifo.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/math.Po ./$(DEPDIR)/mmaps.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/named_fifo.Po ./$(DEPDIR)/orphan.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/overlap.Po ./$(DEPDIR)/pause.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/pid_in_use.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/pid_restore.Po ./$(DEPDIR)/pipe.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/prctl.Po ./$(DEPDIR)/ptrace.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/readdir.Po ./$(DEPDIR)/reloc_aux.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/replace_cb.Po ./$(DEPDIR)/save_aux.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/seq_wrapper.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/sigaltstack.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/sigpending.Po ./$(DEPDIR)/simple.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/simple_pthread.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/stage0001.Po ./$(DEPDIR)/stage0002.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/stage0003.Po ./$(DEPDIR)/stage0004.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/stopped.Po ./$(DEPDIR)/testcxx.Po ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CXXFLAGS) $(CXXFLAGS) ++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + CXXLD = $(CXX) +-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libtest_a_SOURCES) atomics.c atomics_stress.c \ + bug2003_aux.c bug2524.c cb_exit.c child.c cloexec.c \ + cr_signal.c cr_tryenter_cs.c critical_sections.c \ +@@ -407,74 +405,32 @@ + stage0003.c stage0004.c stopped.c $(am__testcxx_SOURCES_DIST) + ETAGS = etags + CTAGS = ctags ++am__tty_colors = \ ++red=; grn=; lgn=; blu=; std= ++am__EXEEXT_15 = $(am__EXEEXT_1) $(SIMPLE_scripts) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -495,20 +451,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -516,12 +472,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -535,70 +490,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + + # Files we clean at various times + CONTEXTS = context.* .context.*.tmp Context[123] .Context[123].tmp +@@ -771,7 +747,6 @@ + check_LIBRARIES = libtest.a + check_HEADERS = crut.h crut_util.h + check_SCRIPTS = check_module clean_temps build_util $(check_scripts) $(check_scripts2) +-TESTS = $(SIMPLE_TESTS) $(SEQ_RUN) $(CRUT_RUN) # Things to actually run + EXTRA_DIST = license.txt CountingApp.java CountingApp.class RUN_ME.in $(all_scripts_src) + MOSTLYCLEANFILES = core core.* $(CONTEXTS) + CLEANFILES = $(SEQ_RUN) $(CRUT_RUN) $(SEQ_RUN2) $(CRUT_RUN2) $(all_scripts) \ +@@ -781,18 +756,18 @@ + + .SUFFIXES: + .SUFFIXES: .c .cc .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign tests/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign tests/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -806,10 +781,11 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + shellinit: $(top_builddir)/config.status $(srcdir)/shellinit.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +@@ -821,39 +797,56 @@ + $(RANLIB) libtest.a + + clean-checkPROGRAMS: +- @list='$(check_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + install-testsexecPROGRAMS: $(testsexec_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(testsexecdir)" || $(mkdir_p) "$(DESTDIR)$(testsexecdir)" +- @list='$(testsexec_PROGRAMS)'; for p in $$list; do \ +- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- if test -f $$p \ +- || test -f $$p1 \ +- ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(testsexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(testsexecdir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(testsexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(testsexecdir)/$$f" || exit 1; \ +- else :; fi; \ +- done ++ test -z "$(testsexecdir)" || $(MKDIR_P) "$(DESTDIR)$(testsexecdir)" ++ @list='$(testsexec_PROGRAMS)'; test -n "$(testsexecdir)" || list=; \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed 's/$(EXEEXT)$$//' | \ ++ while read p p1; do if test -f $$p || test -f $$p1; \ ++ then echo "$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ ++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ ++ sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) files[d] = files[d] " " $$1; \ ++ else { print "f", $$3 "/" $$4, $$1; } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(testsexecdir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(testsexecdir)$$dir" || exit $$?; \ ++ } \ ++ ; done + + uninstall-testsexecPROGRAMS: + @$(NORMAL_UNINSTALL) +- @list='$(testsexec_PROGRAMS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(testsexecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(testsexecdir)/$$f"; \ +- done ++ @list='$(testsexec_PROGRAMS)'; test -n "$(testsexecdir)" || list=; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ ++ -e 's/$$/$(EXEEXT)/' `; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(testsexecdir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(testsexecdir)" && rm -f $$files + + clean-testsexecPROGRAMS: +- @list='$(testsexec_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(testsexec_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + + installcheck-testsexecPROGRAMS: $(testsexec_PROGRAMS) + bad=0; pid=$$$$; list="$(testsexec_PROGRAMS)"; for p in $$list; do \ +@@ -863,7 +856,8 @@ + f=`echo "$$p" | \ + sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + for opt in --help --version; do \ +- if "$(DESTDIR)$(testsexecdir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \ ++ if "$(DESTDIR)$(testsexecdir)/$$f" $$opt >c$${pid}_.out \ ++ 2>c$${pid}_.err &2; bad=1; fi; \ +@@ -871,191 +865,206 @@ + done; rm -f c$${pid}_.???; exit $$bad + atomics$(EXEEXT): $(atomics_OBJECTS) $(atomics_DEPENDENCIES) + @rm -f atomics$(EXEEXT) +- $(LINK) $(atomics_LDFLAGS) $(atomics_OBJECTS) $(atomics_LDADD) $(LIBS) ++ $(atomics_LINK) $(atomics_OBJECTS) $(atomics_LDADD) $(LIBS) + atomics_stress$(EXEEXT): $(atomics_stress_OBJECTS) $(atomics_stress_DEPENDENCIES) + @rm -f atomics_stress$(EXEEXT) +- $(LINK) $(atomics_stress_LDFLAGS) $(atomics_stress_OBJECTS) $(atomics_stress_LDADD) $(LIBS) ++ $(atomics_stress_LINK) $(atomics_stress_OBJECTS) $(atomics_stress_LDADD) $(LIBS) + bug2003_aux$(EXEEXT): $(bug2003_aux_OBJECTS) $(bug2003_aux_DEPENDENCIES) + @rm -f bug2003_aux$(EXEEXT) +- $(LINK) $(bug2003_aux_LDFLAGS) $(bug2003_aux_OBJECTS) $(bug2003_aux_LDADD) $(LIBS) ++ $(bug2003_aux_LINK) $(bug2003_aux_OBJECTS) $(bug2003_aux_LDADD) $(LIBS) + bug2524$(EXEEXT): $(bug2524_OBJECTS) $(bug2524_DEPENDENCIES) + @rm -f bug2524$(EXEEXT) +- $(LINK) $(bug2524_LDFLAGS) $(bug2524_OBJECTS) $(bug2524_LDADD) $(LIBS) ++ $(LINK) $(bug2524_OBJECTS) $(bug2524_LDADD) $(LIBS) + cb_exit$(EXEEXT): $(cb_exit_OBJECTS) $(cb_exit_DEPENDENCIES) + @rm -f cb_exit$(EXEEXT) +- $(LINK) $(cb_exit_LDFLAGS) $(cb_exit_OBJECTS) $(cb_exit_LDADD) $(LIBS) ++ $(LINK) $(cb_exit_OBJECTS) $(cb_exit_LDADD) $(LIBS) + child$(EXEEXT): $(child_OBJECTS) $(child_DEPENDENCIES) + @rm -f child$(EXEEXT) +- $(LINK) $(child_LDFLAGS) $(child_OBJECTS) $(child_LDADD) $(LIBS) ++ $(LINK) $(child_OBJECTS) $(child_LDADD) $(LIBS) + cloexec$(EXEEXT): $(cloexec_OBJECTS) $(cloexec_DEPENDENCIES) + @rm -f cloexec$(EXEEXT) +- $(LINK) $(cloexec_LDFLAGS) $(cloexec_OBJECTS) $(cloexec_LDADD) $(LIBS) ++ $(LINK) $(cloexec_OBJECTS) $(cloexec_LDADD) $(LIBS) + cr_signal$(EXEEXT): $(cr_signal_OBJECTS) $(cr_signal_DEPENDENCIES) + @rm -f cr_signal$(EXEEXT) +- $(LINK) $(cr_signal_LDFLAGS) $(cr_signal_OBJECTS) $(cr_signal_LDADD) $(LIBS) ++ $(LINK) $(cr_signal_OBJECTS) $(cr_signal_LDADD) $(LIBS) + cr_tryenter_cs$(EXEEXT): $(cr_tryenter_cs_OBJECTS) $(cr_tryenter_cs_DEPENDENCIES) + @rm -f cr_tryenter_cs$(EXEEXT) +- $(LINK) $(cr_tryenter_cs_LDFLAGS) $(cr_tryenter_cs_OBJECTS) $(cr_tryenter_cs_LDADD) $(LIBS) ++ $(LINK) $(cr_tryenter_cs_OBJECTS) $(cr_tryenter_cs_LDADD) $(LIBS) + critical_sections$(EXEEXT): $(critical_sections_OBJECTS) $(critical_sections_DEPENDENCIES) + @rm -f critical_sections$(EXEEXT) +- $(LINK) $(critical_sections_LDFLAGS) $(critical_sections_OBJECTS) $(critical_sections_LDADD) $(LIBS) ++ $(LINK) $(critical_sections_OBJECTS) $(critical_sections_LDADD) $(LIBS) + crut_wrapper$(EXEEXT): $(crut_wrapper_OBJECTS) $(crut_wrapper_DEPENDENCIES) + @rm -f crut_wrapper$(EXEEXT) +- $(LINK) $(crut_wrapper_LDFLAGS) $(crut_wrapper_OBJECTS) $(crut_wrapper_LDADD) $(LIBS) ++ $(LINK) $(crut_wrapper_OBJECTS) $(crut_wrapper_LDADD) $(LIBS) + cs_enter_leave$(EXEEXT): $(cs_enter_leave_OBJECTS) $(cs_enter_leave_DEPENDENCIES) + @rm -f cs_enter_leave$(EXEEXT) +- $(LINK) $(cs_enter_leave_LDFLAGS) $(cs_enter_leave_OBJECTS) $(cs_enter_leave_LDADD) $(LIBS) ++ $(LINK) $(cs_enter_leave_OBJECTS) $(cs_enter_leave_LDADD) $(LIBS) + cs_enter_leave2$(EXEEXT): $(cs_enter_leave2_OBJECTS) $(cs_enter_leave2_DEPENDENCIES) + @rm -f cs_enter_leave2$(EXEEXT) +- $(LINK) $(cs_enter_leave2_LDFLAGS) $(cs_enter_leave2_OBJECTS) $(cs_enter_leave2_LDADD) $(LIBS) ++ $(LINK) $(cs_enter_leave2_OBJECTS) $(cs_enter_leave2_LDADD) $(LIBS) + cwd$(EXEEXT): $(cwd_OBJECTS) $(cwd_DEPENDENCIES) + @rm -f cwd$(EXEEXT) +- $(LINK) $(cwd_LDFLAGS) $(cwd_OBJECTS) $(cwd_LDADD) $(LIBS) ++ $(LINK) $(cwd_OBJECTS) $(cwd_LDADD) $(LIBS) + dev_null$(EXEEXT): $(dev_null_OBJECTS) $(dev_null_DEPENDENCIES) + @rm -f dev_null$(EXEEXT) +- $(LINK) $(dev_null_LDFLAGS) $(dev_null_OBJECTS) $(dev_null_LDADD) $(LIBS) ++ $(LINK) $(dev_null_OBJECTS) $(dev_null_LDADD) $(LIBS) + dlopen_aux$(EXEEXT): $(dlopen_aux_OBJECTS) $(dlopen_aux_DEPENDENCIES) + @rm -f dlopen_aux$(EXEEXT) +- $(LINK) $(dlopen_aux_LDFLAGS) $(dlopen_aux_OBJECTS) $(dlopen_aux_LDADD) $(LIBS) ++ $(LINK) $(dlopen_aux_OBJECTS) $(dlopen_aux_LDADD) $(LIBS) + dpipe$(EXEEXT): $(dpipe_OBJECTS) $(dpipe_DEPENDENCIES) + @rm -f dpipe$(EXEEXT) +- $(LINK) $(dpipe_LDFLAGS) $(dpipe_OBJECTS) $(dpipe_LDADD) $(LIBS) ++ $(LINK) $(dpipe_OBJECTS) $(dpipe_LDADD) $(LIBS) + dup$(EXEEXT): $(dup_OBJECTS) $(dup_DEPENDENCIES) + @rm -f dup$(EXEEXT) +- $(LINK) $(dup_LDFLAGS) $(dup_OBJECTS) $(dup_LDADD) $(LIBS) ++ $(LINK) $(dup_OBJECTS) $(dup_LDADD) $(LIBS) + edeadlk$(EXEEXT): $(edeadlk_OBJECTS) $(edeadlk_DEPENDENCIES) + @rm -f edeadlk$(EXEEXT) +- $(LINK) $(edeadlk_LDFLAGS) $(edeadlk_OBJECTS) $(edeadlk_LDADD) $(LIBS) ++ $(LINK) $(edeadlk_OBJECTS) $(edeadlk_LDADD) $(LIBS) + failed_cb$(EXEEXT): $(failed_cb_OBJECTS) $(failed_cb_DEPENDENCIES) + @rm -f failed_cb$(EXEEXT) +- $(LINK) $(failed_cb_LDFLAGS) $(failed_cb_OBJECTS) $(failed_cb_LDADD) $(LIBS) ++ $(LINK) $(failed_cb_OBJECTS) $(failed_cb_LDADD) $(LIBS) + failed_cb2$(EXEEXT): $(failed_cb2_OBJECTS) $(failed_cb2_DEPENDENCIES) + @rm -f failed_cb2$(EXEEXT) +- $(LINK) $(failed_cb2_LDFLAGS) $(failed_cb2_OBJECTS) $(failed_cb2_LDADD) $(LIBS) ++ $(LINK) $(failed_cb2_OBJECTS) $(failed_cb2_LDADD) $(LIBS) + filedescriptors$(EXEEXT): $(filedescriptors_OBJECTS) $(filedescriptors_DEPENDENCIES) + @rm -f filedescriptors$(EXEEXT) +- $(LINK) $(filedescriptors_LDFLAGS) $(filedescriptors_OBJECTS) $(filedescriptors_LDADD) $(LIBS) ++ $(LINK) $(filedescriptors_OBJECTS) $(filedescriptors_LDADD) $(LIBS) + forward$(EXEEXT): $(forward_OBJECTS) $(forward_DEPENDENCIES) + @rm -f forward$(EXEEXT) +- $(LINK) $(forward_LDFLAGS) $(forward_OBJECTS) $(forward_LDADD) $(LIBS) ++ $(LINK) $(forward_OBJECTS) $(forward_LDADD) $(LIBS) + get_info$(EXEEXT): $(get_info_OBJECTS) $(get_info_DEPENDENCIES) + @rm -f get_info$(EXEEXT) +- $(LINK) $(get_info_LDFLAGS) $(get_info_OBJECTS) $(get_info_LDADD) $(LIBS) ++ $(LINK) $(get_info_OBJECTS) $(get_info_LDADD) $(LIBS) + hello$(EXEEXT): $(hello_OBJECTS) $(hello_DEPENDENCIES) + @rm -f hello$(EXEEXT) +- $(LINK) $(hello_LDFLAGS) $(hello_OBJECTS) $(hello_LDADD) $(LIBS) ++ $(LINK) $(hello_OBJECTS) $(hello_LDADD) $(LIBS) + hooks$(EXEEXT): $(hooks_OBJECTS) $(hooks_DEPENDENCIES) + @rm -f hooks$(EXEEXT) +- $(LINK) $(hooks_LDFLAGS) $(hooks_OBJECTS) $(hooks_LDADD) $(LIBS) ++ $(LINK) $(hooks_OBJECTS) $(hooks_LDADD) $(LIBS) + hugetlbfs$(EXEEXT): $(hugetlbfs_OBJECTS) $(hugetlbfs_DEPENDENCIES) + @rm -f hugetlbfs$(EXEEXT) +- $(LINK) $(hugetlbfs_LDFLAGS) $(hugetlbfs_OBJECTS) $(hugetlbfs_LDADD) $(LIBS) ++ $(LINK) $(hugetlbfs_OBJECTS) $(hugetlbfs_LDADD) $(LIBS) + hugetlbfs2$(EXEEXT): $(hugetlbfs2_OBJECTS) $(hugetlbfs2_DEPENDENCIES) + @rm -f hugetlbfs2$(EXEEXT) +- $(LINK) $(hugetlbfs2_LDFLAGS) $(hugetlbfs2_OBJECTS) $(hugetlbfs2_LDADD) $(LIBS) ++ $(LINK) $(hugetlbfs2_OBJECTS) $(hugetlbfs2_LDADD) $(LIBS) + lam$(EXEEXT): $(lam_OBJECTS) $(lam_DEPENDENCIES) + @rm -f lam$(EXEEXT) +- $(LINK) $(lam_LDFLAGS) $(lam_OBJECTS) $(lam_LDADD) $(LIBS) ++ $(LINK) $(lam_OBJECTS) $(lam_LDADD) $(LIBS) + linked_fifo$(EXEEXT): $(linked_fifo_OBJECTS) $(linked_fifo_DEPENDENCIES) + @rm -f linked_fifo$(EXEEXT) +- $(LINK) $(linked_fifo_LDFLAGS) $(linked_fifo_OBJECTS) $(linked_fifo_LDADD) $(LIBS) ++ $(LINK) $(linked_fifo_OBJECTS) $(linked_fifo_LDADD) $(LIBS) + math$(EXEEXT): $(math_OBJECTS) $(math_DEPENDENCIES) + @rm -f math$(EXEEXT) +- $(LINK) $(math_LDFLAGS) $(math_OBJECTS) $(math_LDADD) $(LIBS) ++ $(LINK) $(math_OBJECTS) $(math_LDADD) $(LIBS) + mmaps$(EXEEXT): $(mmaps_OBJECTS) $(mmaps_DEPENDENCIES) + @rm -f mmaps$(EXEEXT) +- $(LINK) $(mmaps_LDFLAGS) $(mmaps_OBJECTS) $(mmaps_LDADD) $(LIBS) ++ $(LINK) $(mmaps_OBJECTS) $(mmaps_LDADD) $(LIBS) + named_fifo$(EXEEXT): $(named_fifo_OBJECTS) $(named_fifo_DEPENDENCIES) + @rm -f named_fifo$(EXEEXT) +- $(LINK) $(named_fifo_LDFLAGS) $(named_fifo_OBJECTS) $(named_fifo_LDADD) $(LIBS) ++ $(LINK) $(named_fifo_OBJECTS) $(named_fifo_LDADD) $(LIBS) + orphan$(EXEEXT): $(orphan_OBJECTS) $(orphan_DEPENDENCIES) + @rm -f orphan$(EXEEXT) +- $(LINK) $(orphan_LDFLAGS) $(orphan_OBJECTS) $(orphan_LDADD) $(LIBS) ++ $(LINK) $(orphan_OBJECTS) $(orphan_LDADD) $(LIBS) + overlap$(EXEEXT): $(overlap_OBJECTS) $(overlap_DEPENDENCIES) + @rm -f overlap$(EXEEXT) +- $(LINK) $(overlap_LDFLAGS) $(overlap_OBJECTS) $(overlap_LDADD) $(LIBS) ++ $(LINK) $(overlap_OBJECTS) $(overlap_LDADD) $(LIBS) + pause$(EXEEXT): $(pause_OBJECTS) $(pause_DEPENDENCIES) + @rm -f pause$(EXEEXT) +- $(LINK) $(pause_LDFLAGS) $(pause_OBJECTS) $(pause_LDADD) $(LIBS) ++ $(pause_LINK) $(pause_OBJECTS) $(pause_LDADD) $(LIBS) + pid_in_use$(EXEEXT): $(pid_in_use_OBJECTS) $(pid_in_use_DEPENDENCIES) + @rm -f pid_in_use$(EXEEXT) +- $(LINK) $(pid_in_use_LDFLAGS) $(pid_in_use_OBJECTS) $(pid_in_use_LDADD) $(LIBS) ++ $(LINK) $(pid_in_use_OBJECTS) $(pid_in_use_LDADD) $(LIBS) + pid_restore$(EXEEXT): $(pid_restore_OBJECTS) $(pid_restore_DEPENDENCIES) + @rm -f pid_restore$(EXEEXT) +- $(LINK) $(pid_restore_LDFLAGS) $(pid_restore_OBJECTS) $(pid_restore_LDADD) $(LIBS) ++ $(LINK) $(pid_restore_OBJECTS) $(pid_restore_LDADD) $(LIBS) + pipe$(EXEEXT): $(pipe_OBJECTS) $(pipe_DEPENDENCIES) + @rm -f pipe$(EXEEXT) +- $(LINK) $(pipe_LDFLAGS) $(pipe_OBJECTS) $(pipe_LDADD) $(LIBS) ++ $(LINK) $(pipe_OBJECTS) $(pipe_LDADD) $(LIBS) + prctl$(EXEEXT): $(prctl_OBJECTS) $(prctl_DEPENDENCIES) + @rm -f prctl$(EXEEXT) +- $(LINK) $(prctl_LDFLAGS) $(prctl_OBJECTS) $(prctl_LDADD) $(LIBS) ++ $(LINK) $(prctl_OBJECTS) $(prctl_LDADD) $(LIBS) + ptrace$(EXEEXT): $(ptrace_OBJECTS) $(ptrace_DEPENDENCIES) + @rm -f ptrace$(EXEEXT) +- $(LINK) $(ptrace_LDFLAGS) $(ptrace_OBJECTS) $(ptrace_LDADD) $(LIBS) ++ $(ptrace_LINK) $(ptrace_OBJECTS) $(ptrace_LDADD) $(LIBS) + readdir$(EXEEXT): $(readdir_OBJECTS) $(readdir_DEPENDENCIES) + @rm -f readdir$(EXEEXT) +- $(LINK) $(readdir_LDFLAGS) $(readdir_OBJECTS) $(readdir_LDADD) $(LIBS) ++ $(LINK) $(readdir_OBJECTS) $(readdir_LDADD) $(LIBS) + reloc_aux$(EXEEXT): $(reloc_aux_OBJECTS) $(reloc_aux_DEPENDENCIES) + @rm -f reloc_aux$(EXEEXT) +- $(LINK) $(reloc_aux_LDFLAGS) $(reloc_aux_OBJECTS) $(reloc_aux_LDADD) $(LIBS) ++ $(reloc_aux_LINK) $(reloc_aux_OBJECTS) $(reloc_aux_LDADD) $(LIBS) + replace_cb$(EXEEXT): $(replace_cb_OBJECTS) $(replace_cb_DEPENDENCIES) + @rm -f replace_cb$(EXEEXT) +- $(LINK) $(replace_cb_LDFLAGS) $(replace_cb_OBJECTS) $(replace_cb_LDADD) $(LIBS) ++ $(LINK) $(replace_cb_OBJECTS) $(replace_cb_LDADD) $(LIBS) + save_aux$(EXEEXT): $(save_aux_OBJECTS) $(save_aux_DEPENDENCIES) + @rm -f save_aux$(EXEEXT) +- $(LINK) $(save_aux_LDFLAGS) $(save_aux_OBJECTS) $(save_aux_LDADD) $(LIBS) ++ $(save_aux_LINK) $(save_aux_OBJECTS) $(save_aux_LDADD) $(LIBS) + seq_wrapper$(EXEEXT): $(seq_wrapper_OBJECTS) $(seq_wrapper_DEPENDENCIES) + @rm -f seq_wrapper$(EXEEXT) +- $(LINK) $(seq_wrapper_LDFLAGS) $(seq_wrapper_OBJECTS) $(seq_wrapper_LDADD) $(LIBS) ++ $(LINK) $(seq_wrapper_OBJECTS) $(seq_wrapper_LDADD) $(LIBS) + sigaltstack$(EXEEXT): $(sigaltstack_OBJECTS) $(sigaltstack_DEPENDENCIES) + @rm -f sigaltstack$(EXEEXT) +- $(LINK) $(sigaltstack_LDFLAGS) $(sigaltstack_OBJECTS) $(sigaltstack_LDADD) $(LIBS) ++ $(LINK) $(sigaltstack_OBJECTS) $(sigaltstack_LDADD) $(LIBS) + sigpending$(EXEEXT): $(sigpending_OBJECTS) $(sigpending_DEPENDENCIES) + @rm -f sigpending$(EXEEXT) +- $(LINK) $(sigpending_LDFLAGS) $(sigpending_OBJECTS) $(sigpending_LDADD) $(LIBS) ++ $(LINK) $(sigpending_OBJECTS) $(sigpending_LDADD) $(LIBS) + simple$(EXEEXT): $(simple_OBJECTS) $(simple_DEPENDENCIES) + @rm -f simple$(EXEEXT) +- $(LINK) $(simple_LDFLAGS) $(simple_OBJECTS) $(simple_LDADD) $(LIBS) ++ $(LINK) $(simple_OBJECTS) $(simple_LDADD) $(LIBS) + simple_pthread$(EXEEXT): $(simple_pthread_OBJECTS) $(simple_pthread_DEPENDENCIES) + @rm -f simple_pthread$(EXEEXT) +- $(LINK) $(simple_pthread_LDFLAGS) $(simple_pthread_OBJECTS) $(simple_pthread_LDADD) $(LIBS) ++ $(LINK) $(simple_pthread_OBJECTS) $(simple_pthread_LDADD) $(LIBS) + stage0001$(EXEEXT): $(stage0001_OBJECTS) $(stage0001_DEPENDENCIES) + @rm -f stage0001$(EXEEXT) +- $(LINK) $(stage0001_LDFLAGS) $(stage0001_OBJECTS) $(stage0001_LDADD) $(LIBS) ++ $(LINK) $(stage0001_OBJECTS) $(stage0001_LDADD) $(LIBS) + stage0002$(EXEEXT): $(stage0002_OBJECTS) $(stage0002_DEPENDENCIES) + @rm -f stage0002$(EXEEXT) +- $(LINK) $(stage0002_LDFLAGS) $(stage0002_OBJECTS) $(stage0002_LDADD) $(LIBS) ++ $(LINK) $(stage0002_OBJECTS) $(stage0002_LDADD) $(LIBS) + stage0003$(EXEEXT): $(stage0003_OBJECTS) $(stage0003_DEPENDENCIES) + @rm -f stage0003$(EXEEXT) +- $(LINK) $(stage0003_LDFLAGS) $(stage0003_OBJECTS) $(stage0003_LDADD) $(LIBS) ++ $(LINK) $(stage0003_OBJECTS) $(stage0003_LDADD) $(LIBS) + stage0004$(EXEEXT): $(stage0004_OBJECTS) $(stage0004_DEPENDENCIES) + @rm -f stage0004$(EXEEXT) +- $(LINK) $(stage0004_LDFLAGS) $(stage0004_OBJECTS) $(stage0004_LDADD) $(LIBS) ++ $(LINK) $(stage0004_OBJECTS) $(stage0004_LDADD) $(LIBS) + stopped$(EXEEXT): $(stopped_OBJECTS) $(stopped_DEPENDENCIES) + @rm -f stopped$(EXEEXT) +- $(LINK) $(stopped_LDFLAGS) $(stopped_OBJECTS) $(stopped_LDADD) $(LIBS) ++ $(LINK) $(stopped_OBJECTS) $(stopped_LDADD) $(LIBS) + testcxx$(EXEEXT): $(testcxx_OBJECTS) $(testcxx_DEPENDENCIES) + @rm -f testcxx$(EXEEXT) +- $(CXXLINK) $(testcxx_LDFLAGS) $(testcxx_OBJECTS) $(testcxx_LDADD) $(LIBS) ++ $(CXXLINK) $(testcxx_OBJECTS) $(testcxx_LDADD) $(LIBS) + install-testsexecSCRIPTS: $(testsexec_SCRIPTS) + @$(NORMAL_INSTALL) +- test -z "$(testsexecdir)" || $(mkdir_p) "$(DESTDIR)$(testsexecdir)" +- @list='$(testsexec_SCRIPTS)'; for p in $$list; do \ ++ test -z "$(testsexecdir)" || $(MKDIR_P) "$(DESTDIR)$(testsexecdir)" ++ @list='$(testsexec_SCRIPTS)'; test -n "$(testsexecdir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(testsexecSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(testsexecdir)/$$f'"; \ +- $(testsexecSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(testsexecdir)/$$f"; \ +- else :; fi; \ +- done ++ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n' \ ++ -e 'h;s|.*|.|' \ ++ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) { files[d] = files[d] " " $$1; \ ++ if (++n[d] == $(am__install_max)) { \ ++ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ ++ else { print "f", d "/" $$4, $$1 } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(testsexecdir)$$dir'"; \ ++ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(testsexecdir)$$dir" || exit $$?; \ ++ } \ ++ ; done + + uninstall-testsexecSCRIPTS: + @$(NORMAL_UNINSTALL) +- @list='$(testsexec_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(testsexecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(testsexecdir)/$$f"; \ +- done ++ @list='$(testsexec_SCRIPTS)'; test -n "$(testsexecdir)" || exit 0; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 's,.*/,,;$(transform)'`; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(testsexecdir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(testsexecdir)" && rm -f $$files + + installcheck-testsexecSCRIPTS: $(testsexec_SCRIPTS) + bad=0; pid=$$$$; list="$(testsexec_SCRIPTS)"; for p in $$list; do \ +@@ -1064,7 +1073,8 @@ + esac; \ + f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ + for opt in --help --version; do \ +- if "$(DESTDIR)$(testsexecdir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \ ++ if "$(DESTDIR)$(testsexecdir)/$$f" $$opt >c$${pid}_.out \ ++ 2>c$${pid}_.err &2; bad=1; fi; \ +@@ -1139,99 +1149,73 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testcxx.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + atomics-atomics.o: atomics.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -MT atomics-atomics.o -MD -MP -MF "$(DEPDIR)/atomics-atomics.Tpo" -c -o atomics-atomics.o `test -f 'atomics.c' || echo '$(srcdir)/'`atomics.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/atomics-atomics.Tpo" "$(DEPDIR)/atomics-atomics.Po"; else rm -f "$(DEPDIR)/atomics-atomics.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -MT atomics-atomics.o -MD -MP -MF $(DEPDIR)/atomics-atomics.Tpo -c -o atomics-atomics.o `test -f 'atomics.c' || echo '$(srcdir)/'`atomics.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/atomics-atomics.Tpo $(DEPDIR)/atomics-atomics.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='atomics.c' object='atomics-atomics.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/atomics-atomics.Po' tmpdepfile='$(DEPDIR)/atomics-atomics.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -c -o atomics-atomics.o `test -f 'atomics.c' || echo '$(srcdir)/'`atomics.c + + atomics-atomics.obj: atomics.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -MT atomics-atomics.obj -MD -MP -MF "$(DEPDIR)/atomics-atomics.Tpo" -c -o atomics-atomics.obj `if test -f 'atomics.c'; then $(CYGPATH_W) 'atomics.c'; else $(CYGPATH_W) '$(srcdir)/atomics.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/atomics-atomics.Tpo" "$(DEPDIR)/atomics-atomics.Po"; else rm -f "$(DEPDIR)/atomics-atomics.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -MT atomics-atomics.obj -MD -MP -MF $(DEPDIR)/atomics-atomics.Tpo -c -o atomics-atomics.obj `if test -f 'atomics.c'; then $(CYGPATH_W) 'atomics.c'; else $(CYGPATH_W) '$(srcdir)/atomics.c'; fi` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/atomics-atomics.Tpo $(DEPDIR)/atomics-atomics.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='atomics.c' object='atomics-atomics.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/atomics-atomics.Po' tmpdepfile='$(DEPDIR)/atomics-atomics.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -c -o atomics-atomics.obj `if test -f 'atomics.c'; then $(CYGPATH_W) 'atomics.c'; else $(CYGPATH_W) '$(srcdir)/atomics.c'; fi` + +-atomics-atomics.lo: atomics.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -MT atomics-atomics.lo -MD -MP -MF "$(DEPDIR)/atomics-atomics.Tpo" -c -o atomics-atomics.lo `test -f 'atomics.c' || echo '$(srcdir)/'`atomics.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/atomics-atomics.Tpo" "$(DEPDIR)/atomics-atomics.Plo"; else rm -f "$(DEPDIR)/atomics-atomics.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='atomics.c' object='atomics-atomics.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/atomics-atomics.Plo' tmpdepfile='$(DEPDIR)/atomics-atomics.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_CFLAGS) $(CFLAGS) -c -o atomics-atomics.lo `test -f 'atomics.c' || echo '$(srcdir)/'`atomics.c +- + atomics_stress-atomics_stress.o: atomics_stress.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -MT atomics_stress-atomics_stress.o -MD -MP -MF "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" -c -o atomics_stress-atomics_stress.o `test -f 'atomics_stress.c' || echo '$(srcdir)/'`atomics_stress.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" "$(DEPDIR)/atomics_stress-atomics_stress.Po"; else rm -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -MT atomics_stress-atomics_stress.o -MD -MP -MF $(DEPDIR)/atomics_stress-atomics_stress.Tpo -c -o atomics_stress-atomics_stress.o `test -f 'atomics_stress.c' || echo '$(srcdir)/'`atomics_stress.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/atomics_stress-atomics_stress.Tpo $(DEPDIR)/atomics_stress-atomics_stress.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='atomics_stress.c' object='atomics_stress-atomics_stress.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/atomics_stress-atomics_stress.Po' tmpdepfile='$(DEPDIR)/atomics_stress-atomics_stress.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -c -o atomics_stress-atomics_stress.o `test -f 'atomics_stress.c' || echo '$(srcdir)/'`atomics_stress.c + + atomics_stress-atomics_stress.obj: atomics_stress.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -MT atomics_stress-atomics_stress.obj -MD -MP -MF "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" -c -o atomics_stress-atomics_stress.obj `if test -f 'atomics_stress.c'; then $(CYGPATH_W) 'atomics_stress.c'; else $(CYGPATH_W) '$(srcdir)/atomics_stress.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" "$(DEPDIR)/atomics_stress-atomics_stress.Po"; else rm -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -MT atomics_stress-atomics_stress.obj -MD -MP -MF $(DEPDIR)/atomics_stress-atomics_stress.Tpo -c -o atomics_stress-atomics_stress.obj `if test -f 'atomics_stress.c'; then $(CYGPATH_W) 'atomics_stress.c'; else $(CYGPATH_W) '$(srcdir)/atomics_stress.c'; fi` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/atomics_stress-atomics_stress.Tpo $(DEPDIR)/atomics_stress-atomics_stress.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='atomics_stress.c' object='atomics_stress-atomics_stress.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/atomics_stress-atomics_stress.Po' tmpdepfile='$(DEPDIR)/atomics_stress-atomics_stress.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -c -o atomics_stress-atomics_stress.obj `if test -f 'atomics_stress.c'; then $(CYGPATH_W) 'atomics_stress.c'; else $(CYGPATH_W) '$(srcdir)/atomics_stress.c'; fi` + +-atomics_stress-atomics_stress.lo: atomics_stress.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -MT atomics_stress-atomics_stress.lo -MD -MP -MF "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" -c -o atomics_stress-atomics_stress.lo `test -f 'atomics_stress.c' || echo '$(srcdir)/'`atomics_stress.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo" "$(DEPDIR)/atomics_stress-atomics_stress.Plo"; else rm -f "$(DEPDIR)/atomics_stress-atomics_stress.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='atomics_stress.c' object='atomics_stress-atomics_stress.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/atomics_stress-atomics_stress.Plo' tmpdepfile='$(DEPDIR)/atomics_stress-atomics_stress.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atomics_stress_CFLAGS) $(CFLAGS) -c -o atomics_stress-atomics_stress.lo `test -f 'atomics_stress.c' || echo '$(srcdir)/'`atomics_stress.c +- + .cc.o: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + + .cc.obj: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .cc.lo: +-@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -1240,52 +1224,54 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -1293,7 +1279,8 @@ + check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ +- list='$(TESTS)'; \ ++ list=' $(TESTS) '; \ ++ $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -1302,91 +1289,112 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ +- echo "XPASS: $$tst"; \ ++ col=$$red; res=XPASS; \ + ;; \ + *) \ +- echo "PASS: $$tst"; \ ++ col=$$grn; res=PASS; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ +- echo "XFAIL: $$tst"; \ ++ col=$$lgn; res=XFAIL; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ +- echo "FAIL: $$tst"; \ ++ col=$$red; res=FAIL; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ +- echo "SKIP: $$tst"; \ ++ col=$$blu; res=SKIP; \ + fi; \ ++ echo "$${col}$$res$${std}: $$tst"; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ +- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ ++ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ +- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ +- echo "$$dashes"; \ ++ if test "$$failed" -eq 0; then \ ++ echo "$$grn$$dashes"; \ ++ else \ ++ echo "$$red$$dashes"; \ ++ fi; \ + echo "$$banner"; \ +- test -n "$$skipped" && echo "$$skipped"; \ +- test -n "$$report" && echo "$$report"; \ +- echo "$$dashes"; \ ++ test -z "$$skipped" || echo "$$skipped"; \ ++ test -z "$$report" || echo "$$report"; \ ++ echo "$$dashes$$std"; \ + test "$$failed" -eq 0; \ + else :; fi + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -1398,7 +1406,7 @@ + all-am: Makefile $(PROGRAMS) $(SCRIPTS) + installdirs: + for dir in "$(DESTDIR)$(testsexecdir)" "$(DESTDIR)$(testsexecdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -1421,11 +1429,14 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." ++@CR_BUILD_TESTSUITE_FALSE@uninstall-local: ++@CR_BUILD_TESTSUITE_FALSE@install-exec-local: + clean: clean-am + + clean-am: clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \ +@@ -1436,7 +1447,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -1444,19 +1455,39 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: install-exec-local install-testsexecPROGRAMS \ + install-testsexecSCRIPTS + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: installcheck-testsexecPROGRAMS \ + installcheck-testsexecSCRIPTS + +@@ -1478,8 +1509,10 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local \ +- uninstall-testsexecPROGRAMS uninstall-testsexecSCRIPTS ++uninstall-am: uninstall-local uninstall-testsexecPROGRAMS \ ++ uninstall-testsexecSCRIPTS ++ ++.MAKE: check-am install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \ +@@ -1487,16 +1520,18 @@ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am \ +- install-exec-local install-info install-info-am install-man \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-exec-local install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-testsexecPROGRAMS \ + install-testsexecSCRIPTS installcheck installcheck-am \ + installcheck-testsexecPROGRAMS installcheck-testsexecSCRIPTS \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-info-am uninstall-local \ +- uninstall-testsexecPROGRAMS uninstall-testsexecSCRIPTS ++ uninstall-am uninstall-local uninstall-testsexecPROGRAMS \ ++ uninstall-testsexecSCRIPTS + + + # Special target (run before tests) ensures the kernel modules are loaded +@@ -1590,6 +1625,7 @@ + FORCE: + + # Preserve the empty line above! ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 util/Makefile.in +--- a/util/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/util/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -13,15 +14,12 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -33,6 +31,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + subdir = util + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -41,88 +40,75 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = cr_checkpoint cr_restart cr_run cr_info + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -143,20 +129,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -164,12 +150,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -183,70 +168,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + @BUILD_CR_INFO_FALSE@cr_info = + + # cr_info is disabled since vmadcheck is currently broken -PHH 12.5.03 +@@ -256,18 +262,18 @@ + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign util/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign util/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign util/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign util/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -281,10 +287,11 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo +@@ -292,10 +299,6 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -303,7 +306,13 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @fail= failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -314,16 +323,21 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @fail= failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -343,16 +357,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -360,94 +374,120 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ test ! -f $$subdir/TAGS || \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || mkdir "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- (cd $$subdir && \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="../$(top_distdir)" \ +- distdir="../$(distdir)/$$subdir" \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -476,7 +516,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -487,8 +528,7 @@ + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + +@@ -496,18 +536,38 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ ++install-dvi-am: ++ + install-exec-am: + ++install-html: install-html-recursive ++ ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-pdf-am: ++ ++install-ps: install-ps-recursive ++ ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -526,22 +586,25 @@ + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ ++ install-am install-strip tags-recursive + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am html \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic clean-libtool \ ++ ctags ctags-recursive distclean distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -r 3c8a74e0c599 util/cr_checkpoint/Makefile.in +--- a/util/cr_checkpoint/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/util/cr_checkpoint/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -14,17 +15,12 @@ + + @SET_MAKE@ + +-SOURCES = cr_checkpoint.c +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -36,6 +32,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + bin_PROGRAMS = cr_checkpoint$(EXEEXT) + @CR_INSTALLED_LIBCR_TRUE@cr_checkpoint_DEPENDENCIES = +@@ -46,29 +43,51 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" +-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) + cr_checkpoint_SOURCES = cr_checkpoint.c + cr_checkpoint_OBJECTS = cr_checkpoint.$(OBJEXT) + cr_checkpoint_LDADD = $(LDADD) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/./config/depcomp + am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cr_checkpoint.Po ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = cr_checkpoint.c + DIST_SOURCES = cr_checkpoint.c ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + man1dir = $(mandir)/man1 + NROFF = nroff + MANS = $(man_MANS) +@@ -76,72 +95,27 @@ + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -162,20 +136,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -183,12 +157,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -202,70 +175,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + @CR_INSTALLED_LIBCR_FALSE@LDADD = -L$(top_builddir)/libcr -lcr @CR_CLIENT_LDADD@ + @CR_INSTALLED_LIBCR_TRUE@LDADD = -L$(libdir) -lcr @CR_CLIENT_LDADD@ + @CR_INSTALLED_LIBCR_FALSE@INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include +@@ -284,18 +278,18 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign util/cr_checkpoint/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign util/cr_checkpoint/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign util/cr_checkpoint/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign util/cr_checkpoint/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -309,38 +303,54 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- if test -f $$p \ +- || test -f $$p1 \ +- ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ +- else :; fi; \ +- done ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed 's/$(EXEEXT)$$//' | \ ++ while read p p1; do if test -f $$p || test -f $$p1; \ ++ then echo "$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ ++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ ++ sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) files[d] = files[d] " " $$1; \ ++ else { print "f", $$3 "/" $$4, $$1; } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ ++ } \ ++ ; done + + uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ ++ -e 's/$$/$(EXEEXT)/' `; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(bindir)" && rm -f $$files + + clean-binPROGRAMS: +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + + installcheck-binPROGRAMS: $(bin_PROGRAMS) + bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ +@@ -350,7 +360,8 @@ + f=`echo "$$p" | \ + sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + for opt in --help --version; do \ +- if "$(DESTDIR)$(bindir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \ ++ if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ ++ 2>c$${pid}_.err &2; bad=1; fi; \ +@@ -358,7 +369,7 @@ + done; rm -f c$${pid}_.???; exit $$bad + cr_checkpoint$(EXEEXT): $(cr_checkpoint_OBJECTS) $(cr_checkpoint_DEPENDENCIES) + @rm -f cr_checkpoint$(EXEEXT) +- $(LINK) $(cr_checkpoint_LDFLAGS) $(cr_checkpoint_OBJECTS) $(cr_checkpoint_LDADD) $(LIBS) ++ $(LINK) $(cr_checkpoint_OBJECTS) $(cr_checkpoint_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -369,27 +380,24 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cr_checkpoint.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -397,126 +405,137 @@ + + clean-libtool: + -rm -rf .libs _libs ++install-man1: $(man_MANS) ++ @$(NORMAL_INSTALL) ++ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" ++ @list=''; test -n "$(man1dir)" || exit 0; \ ++ { for i in $$list; do echo "$$i"; done; \ ++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ ++ sed -n '/\.1[a-z]*$$/p'; \ ++ } | while read p; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; echo "$$p"; \ ++ done | \ ++ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ ++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ ++ sed 'N;N;s,\n, ,g' | { \ ++ list=; while read file base inst; do \ ++ if test "$$base" = "$$inst"; then list="$$list $$file"; else \ ++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ ++ fi; \ ++ done; \ ++ for i in $$list; do echo "$$i"; done | $(am__base_list) | \ ++ while read files; do \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ ++ done; } + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-install-man1: $(man1_MANS) $(man_MANS) +- @$(NORMAL_INSTALL) +- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" +- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ +- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ +- for i in $$l2; do \ +- case "$$i" in \ +- *.1*) list="$$list $$i" ;; \ +- esac; \ +- done; \ +- for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ +- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ +- case "$$ext" in \ +- 1*) ;; \ +- *) ext='1' ;; \ +- esac; \ +- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ +- inst=`echo $$inst | sed -e 's/^.*\///'`; \ +- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ +- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ +- done + uninstall-man1: + @$(NORMAL_UNINSTALL) +- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ +- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ +- for i in $$l2; do \ +- case "$$i" in \ +- *.1*) list="$$list $$i" ;; \ +- esac; \ +- done; \ +- for i in $$list; do \ +- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ +- case "$$ext" in \ +- 1*) ;; \ +- *) ext='1' ;; \ +- esac; \ +- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ +- inst=`echo $$inst | sed -e 's/^.*\///'`; \ +- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ +- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ +- done ++ @list=''; test -n "$(man1dir)" || exit 0; \ ++ files=`{ for i in $$list; do echo "$$i"; done; \ ++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ ++ sed -n '/\.1[a-z]*$$/p'; \ ++ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ ++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ ++ test -z "$$files" || { \ ++ echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -525,7 +544,7 @@ + all-am: Makefile $(PROGRAMS) $(MANS) + installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -547,7 +566,8 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -560,7 +580,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -568,18 +588,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: install-man + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: install-binPROGRAMS + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man1 + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: installcheck-binPROGRAMS + + maintainer-clean: maintainer-clean-am +@@ -600,22 +640,26 @@ + + ps-am: + +-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man ++uninstall-am: uninstall-binPROGRAMS uninstall-man + + uninstall-man: uninstall-man1 + ++.MAKE: install-am install-strip ++ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-binPROGRAMS install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-man1 install-strip installcheck installcheck-am \ ++ install-binPROGRAMS install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-man1 install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ + installcheck-binPROGRAMS installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ +- uninstall-info-am uninstall-man uninstall-man1 ++ uninstall-man uninstall-man1 + + @CR_INSTALLED_LIBCR_FALSE@$(LIBCR): + @CR_INSTALLED_LIBCR_FALSE@ @$(MAKE) $(AM_MAKEFLAGS) --no-print-directory -C $(@D) +@@ -635,6 +679,7 @@ + + @CR_BUILD_MAN_TRUE@dev-clean: + @CR_BUILD_MAN_TRUE@ -rm -rf man1 $(manfiles) ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 util/cr_info/Makefile.in +--- a/util/cr_info/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/util/cr_info/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -14,15 +15,12 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -34,6 +32,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + subdir = util/cr_info + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -42,82 +41,58 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) + SCRIPTS = $(bin_SCRIPTS) + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -138,20 +113,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -159,12 +134,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -178,70 +152,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + vmadump_dir = @TOP_BUILDDIR@/vmadump4 + bin_SCRIPTS = cr_info + CLEANFILES = cr_info +@@ -249,18 +244,18 @@ + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign util/cr_info/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign util/cr_info/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign util/cr_info/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign util/cr_info/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -274,29 +269,45 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done ++ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n' \ ++ -e 'h;s|.*|.|' \ ++ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) { files[d] = files[d] " " $$1; \ ++ if (++n[d] == $(am__install_max)) { \ ++ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ ++ else { print "f", d "/" $$4, $$1 } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ ++ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ ++ } \ ++ ; done + + uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done ++ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 's,.*/,,;$(transform)'`; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(bindir)" && rm -f $$files + + installcheck-binSCRIPTS: $(bin_SCRIPTS) + bad=0; pid=$$$$; list="$(bin_SCRIPTS)"; for p in $$list; do \ +@@ -305,7 +316,8 @@ + esac; \ + f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ + for opt in --help --version; do \ +- if "$(DESTDIR)$(bindir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \ ++ if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ ++ 2>c$${pid}_.err &2; bad=1; fi; \ +@@ -317,10 +329,6 @@ + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + +@@ -329,29 +337,32 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -360,7 +371,7 @@ + all-am: Makefile $(SCRIPTS) + installdirs: + for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -382,7 +393,8 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -393,7 +405,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -401,20 +413,39 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: install-binSCRIPTS + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook ++install-html: install-html-am ++ ++install-html-am: + + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: installcheck-binSCRIPTS + + maintainer-clean: maintainer-clean-am +@@ -433,18 +464,22 @@ + + ps-am: + +-uninstall-am: uninstall-binSCRIPTS uninstall-info-am ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-exec-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-binSCRIPTS install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am \ ++ install-binSCRIPTS install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-exec-hook \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ + installcheck-binSCRIPTS installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-binSCRIPTS uninstall-info-am ++ uninstall-binSCRIPTS + + cr_info: cr_info.in Makefile + @PERL@ -pe 's|\@vmadump_dir\@|$(vmadump_dir)|;\ +@@ -457,6 +492,7 @@ + @PERL@ -ni -e 's|\@libexecdir\@|$(libexecdir)|; \ + print unless /###do_not_install###/' \ + $(DESTDIR)$(bindir)/cr_info ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 util/cr_restart/Makefile.in +--- a/util/cr_restart/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/util/cr_restart/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -14,17 +15,12 @@ + + @SET_MAKE@ + +-SOURCES = cr_restart.c +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -36,6 +32,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + bin_PROGRAMS = cr_restart$(EXEEXT) + @CR_INSTALLED_LIBCR_TRUE@cr_restart_DEPENDENCIES = +@@ -46,29 +43,51 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" +-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) + cr_restart_SOURCES = cr_restart.c + cr_restart_OBJECTS = cr_restart.$(OBJEXT) + cr_restart_LDADD = $(LDADD) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/./config/depcomp + am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cr_restart.Po ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = cr_restart.c + DIST_SOURCES = cr_restart.c ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + man1dir = $(mandir)/man1 + NROFF = nroff + MANS = $(man_MANS) +@@ -76,72 +95,27 @@ + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -162,20 +136,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -183,12 +157,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -202,70 +175,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + @CR_INSTALLED_LIBCR_FALSE@LDADD = -L$(top_builddir)/libcr -lcr @CR_CLIENT_LDADD@ + @CR_INSTALLED_LIBCR_TRUE@LDADD = -L$(libdir) -lcr @CR_CLIENT_LDADD@ + @CR_INSTALLED_LIBCR_FALSE@INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include +@@ -284,18 +278,18 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign util/cr_restart/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign util/cr_restart/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign util/cr_restart/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign util/cr_restart/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -309,38 +303,54 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- if test -f $$p \ +- || test -f $$p1 \ +- ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ +- else :; fi; \ +- done ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed 's/$(EXEEXT)$$//' | \ ++ while read p p1; do if test -f $$p || test -f $$p1; \ ++ then echo "$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ ++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ ++ sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) files[d] = files[d] " " $$1; \ ++ else { print "f", $$3 "/" $$4, $$1; } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ ++ } \ ++ ; done + + uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ ++ -e 's/$$/$(EXEEXT)/' `; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(bindir)" && rm -f $$files + + clean-binPROGRAMS: +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + + installcheck-binPROGRAMS: $(bin_PROGRAMS) + bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ +@@ -350,7 +360,8 @@ + f=`echo "$$p" | \ + sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + for opt in --help --version; do \ +- if "$(DESTDIR)$(bindir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \ ++ if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ ++ 2>c$${pid}_.err &2; bad=1; fi; \ +@@ -358,7 +369,7 @@ + done; rm -f c$${pid}_.???; exit $$bad + cr_restart$(EXEEXT): $(cr_restart_OBJECTS) $(cr_restart_DEPENDENCIES) + @rm -f cr_restart$(EXEEXT) +- $(LINK) $(cr_restart_LDFLAGS) $(cr_restart_OBJECTS) $(cr_restart_LDADD) $(LIBS) ++ $(LINK) $(cr_restart_OBJECTS) $(cr_restart_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -369,27 +380,24 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cr_restart.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -397,126 +405,137 @@ + + clean-libtool: + -rm -rf .libs _libs ++install-man1: $(man_MANS) ++ @$(NORMAL_INSTALL) ++ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" ++ @list=''; test -n "$(man1dir)" || exit 0; \ ++ { for i in $$list; do echo "$$i"; done; \ ++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ ++ sed -n '/\.1[a-z]*$$/p'; \ ++ } | while read p; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; echo "$$p"; \ ++ done | \ ++ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ ++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ ++ sed 'N;N;s,\n, ,g' | { \ ++ list=; while read file base inst; do \ ++ if test "$$base" = "$$inst"; then list="$$list $$file"; else \ ++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ ++ fi; \ ++ done; \ ++ for i in $$list; do echo "$$i"; done | $(am__base_list) | \ ++ while read files; do \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ ++ done; } + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-install-man1: $(man1_MANS) $(man_MANS) +- @$(NORMAL_INSTALL) +- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" +- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ +- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ +- for i in $$l2; do \ +- case "$$i" in \ +- *.1*) list="$$list $$i" ;; \ +- esac; \ +- done; \ +- for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ +- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ +- case "$$ext" in \ +- 1*) ;; \ +- *) ext='1' ;; \ +- esac; \ +- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ +- inst=`echo $$inst | sed -e 's/^.*\///'`; \ +- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ +- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ +- done + uninstall-man1: + @$(NORMAL_UNINSTALL) +- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ +- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ +- for i in $$l2; do \ +- case "$$i" in \ +- *.1*) list="$$list $$i" ;; \ +- esac; \ +- done; \ +- for i in $$list; do \ +- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ +- case "$$ext" in \ +- 1*) ;; \ +- *) ext='1' ;; \ +- esac; \ +- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ +- inst=`echo $$inst | sed -e 's/^.*\///'`; \ +- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ +- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ +- done ++ @list=''; test -n "$(man1dir)" || exit 0; \ ++ files=`{ for i in $$list; do echo "$$i"; done; \ ++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ ++ sed -n '/\.1[a-z]*$$/p'; \ ++ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ ++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ ++ test -z "$$files" || { \ ++ echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -525,7 +544,7 @@ + all-am: Makefile $(PROGRAMS) $(MANS) + installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -547,7 +566,8 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -560,7 +580,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -568,18 +588,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: install-man + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: install-binPROGRAMS + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man1 + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: installcheck-binPROGRAMS + + maintainer-clean: maintainer-clean-am +@@ -600,22 +640,26 @@ + + ps-am: + +-uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man ++uninstall-am: uninstall-binPROGRAMS uninstall-man + + uninstall-man: uninstall-man1 + ++.MAKE: install-am install-strip ++ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-binPROGRAMS install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-man1 install-strip installcheck installcheck-am \ ++ install-binPROGRAMS install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-man1 install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ + installcheck-binPROGRAMS installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ +- uninstall-info-am uninstall-man uninstall-man1 ++ uninstall-man uninstall-man1 + + @CR_INSTALLED_LIBCR_FALSE@$(LIBCR): + @CR_INSTALLED_LIBCR_FALSE@ @$(MAKE) $(AM_MAKEFLAGS) --no-print-directory -C $(@D) +@@ -635,6 +679,7 @@ + + @CR_BUILD_MAN_TRUE@dev-clean: + @CR_BUILD_MAN_TRUE@ -rm -rf man1 $(manfiles) ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 util/cr_run/Makefile.in +--- a/util/cr_run/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/util/cr_run/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -14,15 +15,12 @@ + + @SET_MAKE@ + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -34,6 +32,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + subdir = util/cr_run + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +@@ -42,11 +41,32 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) + SCRIPTS = $(bin_SCRIPTS) + SOURCES = + DIST_SOURCES = +@@ -55,72 +75,27 @@ + MANS = $(man_MANS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -141,20 +116,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -162,12 +137,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -181,70 +155,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + bin_SCRIPTS = cr_run + CLEANFILES = cr_run + EXTRA_DIST = cr_run.in cr_run.1 +@@ -252,18 +247,18 @@ + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign util/cr_run/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign util/cr_run/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign util/cr_run/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign util/cr_run/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -277,29 +272,45 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done ++ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n' \ ++ -e 'h;s|.*|.|' \ ++ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) { files[d] = files[d] " " $$1; \ ++ if (++n[d] == $(am__install_max)) { \ ++ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ ++ else { print "f", d "/" $$4, $$1 } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ ++ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ ++ } \ ++ ; done + + uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done ++ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 's,.*/,,;$(transform)'`; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(bindir)" && rm -f $$files + + installcheck-binSCRIPTS: $(bin_SCRIPTS) + bad=0; pid=$$$$; list="$(bin_SCRIPTS)"; for p in $$list; do \ +@@ -308,7 +319,8 @@ + esac; \ + f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ + for opt in --help --version; do \ +- if "$(DESTDIR)$(bindir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \ ++ if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ ++ 2>c$${pid}_.err &2; bad=1; fi; \ +@@ -320,55 +332,44 @@ + + clean-libtool: + -rm -rf .libs _libs ++install-man1: $(man_MANS) ++ @$(NORMAL_INSTALL) ++ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" ++ @list=''; test -n "$(man1dir)" || exit 0; \ ++ { for i in $$list; do echo "$$i"; done; \ ++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ ++ sed -n '/\.1[a-z]*$$/p'; \ ++ } | while read p; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; echo "$$p"; \ ++ done | \ ++ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ ++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ ++ sed 'N;N;s,\n, ,g' | { \ ++ list=; while read file base inst; do \ ++ if test "$$base" = "$$inst"; then list="$$list $$file"; else \ ++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ ++ fi; \ ++ done; \ ++ for i in $$list; do echo "$$i"; done | $(am__base_list) | \ ++ while read files; do \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ ++ done; } + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-install-man1: $(man1_MANS) $(man_MANS) +- @$(NORMAL_INSTALL) +- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" +- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ +- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ +- for i in $$l2; do \ +- case "$$i" in \ +- *.1*) list="$$list $$i" ;; \ +- esac; \ +- done; \ +- for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ +- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ +- case "$$ext" in \ +- 1*) ;; \ +- *) ext='1' ;; \ +- esac; \ +- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ +- inst=`echo $$inst | sed -e 's/^.*\///'`; \ +- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ +- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ +- done + uninstall-man1: + @$(NORMAL_UNINSTALL) +- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ +- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ +- for i in $$l2; do \ +- case "$$i" in \ +- *.1*) list="$$list $$i" ;; \ +- esac; \ +- done; \ +- for i in $$list; do \ +- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ +- case "$$ext" in \ +- 1*) ;; \ +- *) ext='1' ;; \ +- esac; \ +- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ +- inst=`echo $$inst | sed -e 's/^.*\///'`; \ +- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ +- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ +- done ++ @list=''; test -n "$(man1dir)" || exit 0; \ ++ files=`{ for i in $$list; do echo "$$i"; done; \ ++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ ++ sed -n '/\.1[a-z]*$$/p'; \ ++ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ ++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ ++ test -z "$$files" || { \ ++ echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + tags: TAGS + TAGS: + +@@ -377,29 +378,45 @@ + + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -408,7 +425,7 @@ + all-am: Makefile $(SCRIPTS) $(MANS) + installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -430,7 +447,8 @@ + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -441,7 +459,7 @@ + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -449,20 +467,39 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: install-man + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: install-binSCRIPTS + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook ++install-html: install-html-am ++ ++install-html-am: + + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man1 + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: installcheck-binSCRIPTS + + maintainer-clean: maintainer-clean-am +@@ -481,21 +518,24 @@ + + ps-am: + +-uninstall-am: uninstall-binSCRIPTS uninstall-info-am uninstall-man ++uninstall-am: uninstall-binSCRIPTS uninstall-man + + uninstall-man: uninstall-man1 + ++.MAKE: install-am install-exec-am install-strip ++ + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-binSCRIPTS install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-man1 install-strip installcheck installcheck-am \ ++ install-binSCRIPTS install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-exec-hook \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-man1 install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ + installcheck-binSCRIPTS installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-binSCRIPTS uninstall-info-am uninstall-man \ +- uninstall-man1 ++ uninstall-binSCRIPTS uninstall-man uninstall-man1 + + cr_run: cr_run.in Makefile + @PERL@ -pe 's|\@top_builddir\@|@TOP_BUILDDIR@|g;\ +@@ -514,6 +554,7 @@ + + @CR_BUILD_MAN_TRUE@dev-clean: + @CR_BUILD_MAN_TRUE@ -rm -rf man1 ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -r 3c8a74e0c599 vmadump4/Makefile.in +--- a/vmadump4/Makefile.in Sun Apr 11 12:41:30 2010 +0200 ++++ b/vmadump4/Makefile.in Sun Apr 11 16:31:36 2010 +0200 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.8.3 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in 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. +@@ -17,17 +18,12 @@ + # Note: build is done via cr_module/kbuild/Makefile.in + + +-SOURCES = vmadcheck.c vmadlib.c vmadstress.c vmadtest.c +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -39,6 +35,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ + libexec_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) + check_PROGRAMS = vmadtest$(EXEEXT) vmadstress$(EXEEXT) +@@ -50,13 +47,13 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +-mkinstalldirs = $(mkdir_p) ++mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/blcr_config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + @BUILD_CR_INFO_TRUE@am__EXEEXT_1 = vmadcheck$(EXEEXT) + @BUILD_VMADLIB_TRUE@am__EXEEXT_2 = vmadlib$(EXEEXT) + am__installdirs = "$(DESTDIR)$(libexecdir)" +-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(libexec_PROGRAMS) + vmadcheck_SOURCES = vmadcheck.c + vmadcheck_OBJECTS = vmadcheck.$(OBJEXT) +@@ -70,20 +67,19 @@ + vmadtest_SOURCES = vmadtest.c + vmadtest_OBJECTS = vmadtest.$(OBJEXT) + vmadtest_LDADD = $(LDADD) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/./config/depcomp + am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/vmadcheck.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/vmadlib.Po ./$(DEPDIR)/vmadstress.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/vmadtest.Po ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = vmadcheck.c vmadlib.c vmadstress.c vmadtest.c + DIST_SOURCES = vmadcheck.c vmadlib.c vmadstress.c vmadtest.c + HEADERS = $(noinst_HEADERS) +@@ -91,72 +87,27 @@ + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ +-BUILD_CR_INFO_FALSE = @BUILD_CR_INFO_FALSE@ +-BUILD_CR_INFO_TRUE = @BUILD_CR_INFO_TRUE@ +-BUILD_VMADLIB_FALSE = @BUILD_VMADLIB_FALSE@ +-BUILD_VMADLIB_TRUE = @BUILD_VMADLIB_TRUE@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CRI_DEBUG_FALSE = @CRI_DEBUG_FALSE@ +-CRI_DEBUG_TRUE = @CRI_DEBUG_TRUE@ + CR_ARCH = @CR_ARCH@ +-CR_BUILD_CONTRIB_FALSE = @CR_BUILD_CONTRIB_FALSE@ +-CR_BUILD_CONTRIB_TRUE = @CR_BUILD_CONTRIB_TRUE@ +-CR_BUILD_ETC_FALSE = @CR_BUILD_ETC_FALSE@ +-CR_BUILD_ETC_TRUE = @CR_BUILD_ETC_TRUE@ +-CR_BUILD_EXAMPLES_FALSE = @CR_BUILD_EXAMPLES_FALSE@ +-CR_BUILD_EXAMPLES_TRUE = @CR_BUILD_EXAMPLES_TRUE@ +-CR_BUILD_INCLUDE_FALSE = @CR_BUILD_INCLUDE_FALSE@ +-CR_BUILD_INCLUDE_TRUE = @CR_BUILD_INCLUDE_TRUE@ +-CR_BUILD_LIBCR32_FALSE = @CR_BUILD_LIBCR32_FALSE@ +-CR_BUILD_LIBCR32_TRUE = @CR_BUILD_LIBCR32_TRUE@ +-CR_BUILD_LIBCR_FALSE = @CR_BUILD_LIBCR_FALSE@ +-CR_BUILD_LIBCR_TRUE = @CR_BUILD_LIBCR_TRUE@ +-CR_BUILD_MAN_FALSE = @CR_BUILD_MAN_FALSE@ +-CR_BUILD_MAN_TRUE = @CR_BUILD_MAN_TRUE@ +-CR_BUILD_MODULES_FALSE = @CR_BUILD_MODULES_FALSE@ +-CR_BUILD_MODULES_TRUE = @CR_BUILD_MODULES_TRUE@ +-CR_BUILD_TESTSUITE_FALSE = @CR_BUILD_TESTSUITE_FALSE@ +-CR_BUILD_TESTSUITE_TRUE = @CR_BUILD_TESTSUITE_TRUE@ +-CR_BUILD_TESTS_FALSE = @CR_BUILD_TESTS_FALSE@ +-CR_BUILD_TESTS_TRUE = @CR_BUILD_TESTS_TRUE@ +-CR_BUILD_UTIL_FALSE = @CR_BUILD_UTIL_FALSE@ +-CR_BUILD_UTIL_TRUE = @CR_BUILD_UTIL_TRUE@ + CR_CLIENT_LDADD = @CR_CLIENT_LDADD@ + CR_CPU = @CR_CPU@ +-CR_ENABLE_SHARED_FALSE = @CR_ENABLE_SHARED_FALSE@ +-CR_ENABLE_SHARED_TRUE = @CR_ENABLE_SHARED_TRUE@ +-CR_ENABLE_STATIC_FALSE = @CR_ENABLE_STATIC_FALSE@ +-CR_ENABLE_STATIC_TRUE = @CR_ENABLE_STATIC_TRUE@ + CR_FTB_INCLUDES = @CR_FTB_INCLUDES@ + CR_FTB_LDADD = @CR_FTB_LDADD@ + CR_FTB_LDFLAGS = @CR_FTB_LDFLAGS@ +-CR_HAVE_CXX_FALSE = @CR_HAVE_CXX_FALSE@ +-CR_HAVE_CXX_TRUE = @CR_HAVE_CXX_TRUE@ +-CR_HAVE_FTB_FALSE = @CR_HAVE_FTB_FALSE@ +-CR_HAVE_FTB_TRUE = @CR_HAVE_FTB_TRUE@ +-CR_HAVE_SYSTEM_MAP_FALSE = @CR_HAVE_SYSTEM_MAP_FALSE@ +-CR_HAVE_SYSTEM_MAP_TRUE = @CR_HAVE_SYSTEM_MAP_TRUE@ +-CR_INSTALLED_LIBCR_FALSE = @CR_INSTALLED_LIBCR_FALSE@ +-CR_INSTALLED_LIBCR_TRUE = @CR_INSTALLED_LIBCR_TRUE@ +-CR_INSTALLED_UTIL_FALSE = @CR_INSTALLED_UTIL_FALSE@ +-CR_INSTALLED_UTIL_TRUE = @CR_INSTALLED_UTIL_TRUE@ ++CR_KARCH = @CR_KARCH@ + CR_KERNEL = @CR_KERNEL@ + CR_KERNEL_BASE = @CR_KERNEL_BASE@ +-CR_KERNEL_TRACING_FALSE = @CR_KERNEL_TRACING_FALSE@ +-CR_KERNEL_TRACING_TRUE = @CR_KERNEL_TRACING_TRUE@ + CR_LIBARCH = @CR_LIBARCH@ + CR_LIBCR_CFLAGS = @CR_LIBCR_CFLAGS@ + CR_MODULE_DIR = @CR_MODULE_DIR@ +@@ -177,20 +128,20 @@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-ECHO = @ECHO@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ + GMAKE_ELSE = @GMAKE_ELSE@ + GMAKE_ENDIF = @GMAKE_ENDIF@ + GMAKE_IFEQ = @GMAKE_IFEQ@ + GMAKE_IFNEQ = @GMAKE_IFNEQ@ +-HAVE_RPMBUILD_FALSE = @HAVE_RPMBUILD_FALSE@ +-HAVE_RPMBUILD_TRUE = @HAVE_RPMBUILD_TRUE@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -198,12 +149,11 @@ + KBUILD_MAK = @KBUILD_MAK@ + KBUILD_MAKE_ARGS = @KBUILD_MAKE_ARGS@ + KCC = @KCC@ ++LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCR_MAJOR = @LIBCR_MAJOR@ + LIBCR_MINOR = @LIBCR_MINOR@ + LIBCR_PATCH = @LIBCR_PATCH@ +-LIBCR_TRACING_FALSE = @LIBCR_TRACING_FALSE@ +-LIBCR_TRACING_TRUE = @LIBCR_TRACING_TRUE@ + LIBCR_VERSION = @LIBCR_VERSION@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +@@ -217,70 +167,91 @@ + LINUX_SYMTAB_CONF = @LINUX_SYMTAB_CONF@ + LINUX_SYMTAB_FILE = @LINUX_SYMTAB_FILE@ + LINUX_VER = @LINUX_VER@ ++LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ + MAKE = @MAKE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PWD_PROG = @PWD_PROG@ + RANLIB = @RANLIB@ + RPMBUILD = @RPMBUILD@ ++SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + TOP_BUILDDIR = @TOP_BUILDDIR@ + TOP_SRCDIR = @TOP_SRCDIR@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + EXTRA_DIST = license.txt vmadump_common.c \ + vmadump_i386.c vmadump_x86_64.c \ + vmadump_ppc.c vmadump_ppc64.c \ +@@ -304,18 +275,18 @@ + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign vmadump4/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign vmadump4/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign vmadump4/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign vmadump4/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -329,45 +300,63 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + clean-checkPROGRAMS: +- @list='$(check_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + install-libexecPROGRAMS: $(libexec_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)" +- @list='$(libexec_PROGRAMS)'; for p in $$list; do \ +- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- if test -f $$p \ +- || test -f $$p1 \ +- ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \ +- else :; fi; \ +- done ++ test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" ++ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed 's/$(EXEEXT)$$//' | \ ++ while read p p1; do if test -f $$p || test -f $$p1; \ ++ then echo "$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ ++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ ++ sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) files[d] = files[d] " " $$1; \ ++ else { print "f", $$3 "/" $$4, $$1; } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ ++ } \ ++ ; done + + uninstall-libexecPROGRAMS: + @$(NORMAL_UNINSTALL) +- @list='$(libexec_PROGRAMS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(libexecdir)/$$f"; \ +- done ++ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ ++ -e 's/$$/$(EXEEXT)/' `; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + + clean-libexecPROGRAMS: +- @list='$(libexec_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + + installcheck-libexecPROGRAMS: $(libexec_PROGRAMS) + bad=0; pid=$$$$; list="$(libexec_PROGRAMS)"; for p in $$list; do \ +@@ -377,7 +366,8 @@ + f=`echo "$$p" | \ + sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + for opt in --help --version; do \ +- if "$(DESTDIR)$(libexecdir)/$$f" $$opt > c$${pid}_.out 2> c$${pid}_.err \ ++ if "$(DESTDIR)$(libexecdir)/$$f" $$opt >c$${pid}_.out \ ++ 2>c$${pid}_.err &2; bad=1; fi; \ +@@ -385,16 +375,16 @@ + done; rm -f c$${pid}_.???; exit $$bad + vmadcheck$(EXEEXT): $(vmadcheck_OBJECTS) $(vmadcheck_DEPENDENCIES) + @rm -f vmadcheck$(EXEEXT) +- $(LINK) $(vmadcheck_LDFLAGS) $(vmadcheck_OBJECTS) $(vmadcheck_LDADD) $(LIBS) ++ $(LINK) $(vmadcheck_OBJECTS) $(vmadcheck_LDADD) $(LIBS) + vmadlib$(EXEEXT): $(vmadlib_OBJECTS) $(vmadlib_DEPENDENCIES) + @rm -f vmadlib$(EXEEXT) +- $(LINK) $(vmadlib_LDFLAGS) $(vmadlib_OBJECTS) $(vmadlib_LDADD) $(LIBS) ++ $(LINK) $(vmadlib_OBJECTS) $(vmadlib_LDADD) $(LIBS) + vmadstress$(EXEEXT): $(vmadstress_OBJECTS) $(vmadstress_DEPENDENCIES) + @rm -f vmadstress$(EXEEXT) +- $(LINK) $(vmadstress_LDFLAGS) $(vmadstress_OBJECTS) $(vmadstress_LDADD) $(LIBS) ++ $(LINK) $(vmadstress_OBJECTS) $(vmadstress_LDADD) $(LIBS) + vmadtest$(EXEEXT): $(vmadtest_OBJECTS) $(vmadtest_DEPENDENCIES) + @rm -f vmadtest$(EXEEXT) +- $(LINK) $(vmadtest_LDFLAGS) $(vmadtest_OBJECTS) $(vmadtest_LDADD) $(LIBS) ++ $(LINK) $(vmadtest_OBJECTS) $(vmadtest_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -408,27 +398,24 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmadtest.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: +@@ -437,80 +424,85 @@ + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -520,7 +512,7 @@ + all-am: Makefile $(PROGRAMS) $(HEADERS) + installdirs: + for dir in "$(DESTDIR)$(libexecdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am + install-exec: install-exec-am +@@ -541,7 +533,8 @@ + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -555,7 +548,7 @@ + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + +@@ -563,18 +556,38 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ + install-exec-am: install-libexecPROGRAMS + ++install-html: install-html-am ++ ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ + installcheck-am: installcheck-libexecPROGRAMS + + maintainer-clean: maintainer-clean-am +@@ -595,21 +608,25 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS ++uninstall-am: uninstall-libexecPROGRAMS ++ ++.MAKE: check-am install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-checkPROGRAMS clean-generic clean-libexecPROGRAMS \ + clean-libtool ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecPROGRAMS \ +- install-man install-strip installcheck installcheck-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ + installcheck-libexecPROGRAMS installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-info-am \ +- uninstall-libexecPROGRAMS ++ tags uninstall uninstall-am uninstall-libexecPROGRAMS ++ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6b79a36696..def01205718 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6026,6 +6026,10 @@ let } else null; + blcr = import ../os-specific/linux/blcr/0.8.2.nix { + inherit fetchurl stdenv kernel perl makeWrapper; + }; + exmap = import ../os-specific/linux/exmap { inherit fetchurl stdenv kernel boost pcre pkgconfig; inherit (gtkLibs) gtkmm; From c7404a30dff0028d3c30e6361f893c03eba39715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 15 Apr 2010 12:45:15 +0000 Subject: [PATCH 239/313] Added fclabels. svn path=/nixpkgs/trunk/; revision=21093 --- .../libraries/haskell/fclabels/default.nix | 12 ++++++++++++ .../libraries/haskell/monads-fd/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 ++++++++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/haskell/fclabels/default.nix create mode 100644 pkgs/development/libraries/haskell/monads-fd/default.nix diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix new file mode 100644 index 00000000000..ceb8692bce9 --- /dev/null +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -0,0 +1,12 @@ +{cabal, monadsFd}: + +cabal.mkDerivation (self : { + pname = "fclabels"; + version = "0.4.2"; + sha256 = "d1abfd94f8970e55ed839645a58697b8beeacc5e5ea4a5861001539aa8fc28d7"; + propagatedBuildInputs = [monadsFd]; + meta = { + description = "First class accessor labels"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/monads-fd/default.nix b/pkgs/development/libraries/haskell/monads-fd/default.nix new file mode 100644 index 00000000000..d84d84975ae --- /dev/null +++ b/pkgs/development/libraries/haskell/monads-fd/default.nix @@ -0,0 +1,14 @@ +{cabal, transformers}: + +cabal.mkDerivation (self : { + pname = "monads-fd"; + version = "0.0.0.1"; + sha256 = "7eaac97b2c91a670171f18ebeb3f73b1a45e16576851279f73ea2e1f5ec63b25"; + propagatedBuildInputs = [transformers]; + meta = { + description = "Monad classes, using functional dependencies"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 45474d3ae5b..6ea8dc5825d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -140,6 +140,10 @@ rec { inherit cabal; }; + fclabels = import ../development/libraries/haskell/fclabels { + inherit cabal monadsFd; + }; + filestore = import ../development/libraries/haskell/filestore { inherit cabal datetime parsec regexPosix split time utf8String xml Diff; }; @@ -388,6 +392,10 @@ rec { inherit cabal mtl; }; + monadsFd = import ../development/libraries/haskell/monads-fd { + inherit cabal transformers; + }; + mpppc = import ../development/libraries/haskell/mpppc { inherit cabal ansiTerminal split text; }; From 7d44fab64fe49a4e22215722e712ba57ab44a188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 15 Apr 2010 13:25:43 +0000 Subject: [PATCH 240/313] Added salvia and dependencies. svn path=/nixpkgs/trunk/; revision=21095 --- .../haskell/MaybeT-transformers/default.nix | 14 +++++++++ .../libraries/haskell/bimap/default.nix | 13 ++++++++ .../libraries/haskell/fclabels/default.nix | 2 ++ .../libraries/haskell/pureMD5/default.nix | 14 +++++++++ .../libraries/haskell/safe/default.nix | 13 ++++++++ .../haskell/salvia-protocol/default.nix | 14 +++++++++ .../libraries/haskell/salvia/default.nix | 19 ++++++++++++ .../libraries/haskell/text/default.nix | 9 ++++-- .../haskell/threadmanager/default.nix | 13 ++++++++ pkgs/top-level/haskell-packages.nix | 31 +++++++++++++++++++ 10 files changed, 139 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/haskell/MaybeT-transformers/default.nix create mode 100644 pkgs/development/libraries/haskell/bimap/default.nix create mode 100644 pkgs/development/libraries/haskell/pureMD5/default.nix create mode 100644 pkgs/development/libraries/haskell/safe/default.nix create mode 100644 pkgs/development/libraries/haskell/salvia-protocol/default.nix create mode 100644 pkgs/development/libraries/haskell/salvia/default.nix create mode 100644 pkgs/development/libraries/haskell/threadmanager/default.nix diff --git a/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix b/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix new file mode 100644 index 00000000000..4b67f75ad25 --- /dev/null +++ b/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix @@ -0,0 +1,14 @@ +{cabal, transformers, monadsFd}: + +cabal.mkDerivation (self : { + pname = "MaybeT-transformers"; + version = "0.1"; + sha256 = "b24b78e3a895587722c9ce899f9ef07b509db1a5b3b86f5b7b0e8bc986c8fb8f"; + propagatedBuildInputs = [transformers monadsFd]; + meta = { + description = "Support for computations with failures"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix new file mode 100644 index 00000000000..ec2dd1d3632 --- /dev/null +++ b/pkgs/development/libraries/haskell/bimap/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "bimap"; + version = "0.2.4"; + sha256 = "d991ae393ade2191f42d8a0d659d2b9a749675735eb5b57872f577ede82565c5"; + meta = { + description = "Bidirectional mapping between two key types"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index ceb8692bce9..4c13955a77e 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -7,6 +7,8 @@ cabal.mkDerivation (self : { propagatedBuildInputs = [monadsFd]; meta = { description = "First class accessor labels"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; }; }) diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix new file mode 100644 index 00000000000..1e56df6d4bd --- /dev/null +++ b/pkgs/development/libraries/haskell/pureMD5/default.nix @@ -0,0 +1,14 @@ +{cabal, binary}: + +cabal.mkDerivation (self : { + pname = "pureMD5"; + version = "1.0.0.3"; + sha256 = "3698e5bc8a0e20bed91b52f976235e52f2c1dd876aa40e94d6c7be293d67d482"; + propagatedBuildInputs = [binary]; + meta = { + description = "An unrolled implementation of MD5 purely in Haskell"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix new file mode 100644 index 00000000000..0c41af7e1d3 --- /dev/null +++ b/pkgs/development/libraries/haskell/safe/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "safe"; + version = "0.2"; + sha256 = "73b9a247c3ba8092236c8c912687399778ff31bf3df42d707563a1528a6fc0e0"; + meta = { + description = "Library for safe (pattern match free) functions"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/salvia-protocol/default.nix b/pkgs/development/libraries/haskell/salvia-protocol/default.nix new file mode 100644 index 00000000000..e1418423ae8 --- /dev/null +++ b/pkgs/development/libraries/haskell/salvia-protocol/default.nix @@ -0,0 +1,14 @@ +{cabal, fclabels, parsec, safe, split, utf8String, bimap}: + +cabal.mkDerivation (self : { + pname = "salvia-protocol"; + version = "1.0.1"; + sha256 = "6b2312e52efaa81feec7461b1a3db77e1f2a8dfd829ae878b614c206a5e48928"; + propagatedBuildInputs = [fclabels parsec safe split utf8String bimap]; + meta = { + description = "Salvia webserver protocol suite"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/salvia/default.nix b/pkgs/development/libraries/haskell/salvia/default.nix new file mode 100644 index 00000000000..658273ead31 --- /dev/null +++ b/pkgs/development/libraries/haskell/salvia/default.nix @@ -0,0 +1,19 @@ +{cabal, fclabels, MaybeTTransformers, monadsFd, pureMD5, safe, + salviaProtocol, split, text, threadmanager, transformers, utf8String, + network, stm, time}: + +cabal.mkDerivation (self : { + pname = "salvia"; + version = "1.0.0"; + sha256 = "d1be63e3eb7cb071e8e339d730692b3ce52576e513f718b89a194b17878496e1"; + propagatedBuildInputs = [ + fclabels MaybeTTransformers monadsFd pureMD5 safe salviaProtocol + split text threadmanager transformers utf8String network stm time + ]; + meta = { + description = "Modular web application framework"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/text/default.nix b/pkgs/development/libraries/haskell/text/default.nix index 3fb02befcfa..e2c4b2f13d6 100644 --- a/pkgs/development/libraries/haskell/text/default.nix +++ b/pkgs/development/libraries/haskell/text/default.nix @@ -1,11 +1,14 @@ -{cabal}: +{cabal, deepseq}: cabal.mkDerivation (self : { pname = "text"; - version = "0.5"; - sha256 = "02c3b6a57e1250dc0945d909dffdc256c2e720e751b8a75d6117522c85100fc2"; + version = "0.7.1.0"; + sha256 = "a6daa0ee43ddede620363ab26614fef69361bd5b8f77aa6918b5a4ecb083f425"; + propagatedBuildInputs = [deepseq]; meta = { description = "An efficient package Unicode text type"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; }; }) diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix new file mode 100644 index 00000000000..b80b374baa7 --- /dev/null +++ b/pkgs/development/libraries/haskell/threadmanager/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "threadmanager"; + version = "0.1.3"; + sha256 = "22ca45d7e32518736abb9cde6d2d14163128888769fc02bbc2641fd97318a15a"; + meta = { + description = "Simple thread management"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6ea8dc5825d..81563402d50 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -49,6 +49,10 @@ rec { inherit cabal; }; + bimap = import ../development/libraries/haskell/bimap { + inherit cabal; + }; + binary = import ../development/libraries/haskell/binary { inherit cabal; }; @@ -380,6 +384,10 @@ rec { inherit cabal benchpress; }; + MaybeTTransformers = import ../development/libraries/haskell/MaybeT-transformers { + inherit cabal transformers monadsFd; + }; + mmap = import ../development/libraries/haskell/mmap { inherit cabal; }; @@ -482,6 +490,10 @@ rec { inherit cabal; }; + pureMD5 = import ../development/libraries/haskell/pureMD5 { + inherit cabal binary; + }; + QuickCheck = QuickCheck1; QuickCheck1 = import ../development/libraries/haskell/QuickCheck { @@ -532,6 +544,21 @@ rec { inherit cabal; }; + safe = import ../development/libraries/haskell/safe { + inherit cabal; + }; + + salvia = import ../development/libraries/haskell/salvia { + inherit cabal fclabels MaybeTTransformers monadsFd pureMD5 + safe salviaProtocol split text threadmanager transformers + utf8String stm time; + network = network2217; + }; + + salviaProtocol = import ../development/libraries/haskell/salvia-protocol { + inherit cabal fclabels parsec safe split utf8String bimap; + }; + scion = import ../development/libraries/haskell/scion { inherit cabal ghcPaths ghcSyb hslogger json multiset time uniplate; }; @@ -606,6 +633,10 @@ rec { }; text = import ../development/libraries/haskell/text { + inherit cabal deepseq; + }; + + threadmanager = import ../development/libraries/haskell/threadmanager { inherit cabal; }; From 27a26afc55277d185c3d77f65595f01e20de76f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 15 Apr 2010 13:32:56 +0000 Subject: [PATCH 241/313] Added jpeg library for Haskell. svn path=/nixpkgs/trunk/; revision=21096 --- .../development/libraries/haskell/jpeg/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/jpeg/default.nix diff --git a/pkgs/development/libraries/haskell/jpeg/default.nix b/pkgs/development/libraries/haskell/jpeg/default.nix new file mode 100644 index 00000000000..f9d5b6efa8f --- /dev/null +++ b/pkgs/development/libraries/haskell/jpeg/default.nix @@ -0,0 +1,14 @@ +{cabal, mtl}: + +cabal.mkDerivation (self : { + pname = "jpeg"; + version = "0.0.1"; + sha256 = "848e047cfec5781a28f472e9cd27d016362211d88dd6adb4f826c37d29d8bba6"; + propagatedBuildInputs = [mtl]; + meta = { + description = "JPEG decompression library"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 81563402d50..b731bef93a9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -372,6 +372,10 @@ rec { inherit cabal mtl parsec; }; + jpeg = import ../development/libraries/haskell/jpeg { + inherit cabal mtl; + }; + json = import ../development/libraries/haskell/json { inherit cabal mtl; }; From 52fe24049ca1bc5afb91129318a8fa7051b1e7e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 15 Apr 2010 18:10:42 +0000 Subject: [PATCH 242/313] Added happstack and dependencies. svn path=/nixpkgs/trunk/; revision=21107 --- .../libraries/haskell/MaybeT/default.nix | 14 +++++++ .../libraries/haskell/SMTPClient/default.nix | 14 +++++++ .../haskell/happstack/happstack-data.nix | 13 +++++++ .../haskell/happstack/happstack-server.nix | 16 ++++++++ .../haskell/happstack/happstack-util.nix | 17 ++++++++ .../libraries/haskell/hsemail/default.nix | 14 +++++++ .../libraries/haskell/sendfile/default.nix | 14 +++++++ .../haskell/strictConcurrency/default.nix | 4 +- .../libraries/haskell/syb/syb-with-class.nix | 4 +- .../libraries/haskell/unix-compat/default.nix | 13 +++++++ pkgs/top-level/haskell-packages.nix | 39 ++++++++++++++++++- 11 files changed, 157 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/haskell/MaybeT/default.nix create mode 100644 pkgs/development/libraries/haskell/SMTPClient/default.nix create mode 100644 pkgs/development/libraries/haskell/happstack/happstack-data.nix create mode 100644 pkgs/development/libraries/haskell/happstack/happstack-server.nix create mode 100644 pkgs/development/libraries/haskell/happstack/happstack-util.nix create mode 100644 pkgs/development/libraries/haskell/hsemail/default.nix create mode 100644 pkgs/development/libraries/haskell/sendfile/default.nix create mode 100644 pkgs/development/libraries/haskell/unix-compat/default.nix diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix new file mode 100644 index 00000000000..783ff85d0c2 --- /dev/null +++ b/pkgs/development/libraries/haskell/MaybeT/default.nix @@ -0,0 +1,14 @@ +{cabal, mtl}: + +cabal.mkDerivation (self : { + pname = "MaybeT"; + version = "0.1.2"; + sha256 = "995e61165122656807d84174e5c1516340fd7ddeba6571c20751352a8476b632"; + propagatedBuildInputs = [mtl]; + meta = { + description = "MaybeT monad transformer"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix new file mode 100644 index 00000000000..2da9beea525 --- /dev/null +++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix @@ -0,0 +1,14 @@ +{cabal, hsemail, network}: + +cabal.mkDerivation (self : { + pname = "SMTPClient"; + version = "1.0.2"; + sha256 = "b835cebf22e9281778deeec3ceffeb95aa8ae9c0e1f97e8e9734cf5d87ecba5f"; + propagatedBuildInputs = [hsemail network]; + meta = { + description = "A simple SMTP client library"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/happstack/happstack-data.nix b/pkgs/development/libraries/haskell/happstack/happstack-data.nix new file mode 100644 index 00000000000..9b18652642f --- /dev/null +++ b/pkgs/development/libraries/haskell/happstack/happstack-data.nix @@ -0,0 +1,13 @@ +{cabal, mtl, sybWithClass, HaXml, happstackUtil, binary}: + +cabal.mkDerivation (self : { + pname = "happstack-data"; + version = "0.4.1"; + sha256 = "0d1f96472a4e13b9a5218bce8bf819a50d1773b7e110141ab235d1d7701e39f6"; + propagatedBuildInputs = [mtl sybWithClass HaXml happstackUtil binary]; + meta = { + description = "Happstack data manipulation libraries"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix new file mode 100644 index 00000000000..c1d66c0fabc --- /dev/null +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -0,0 +1,16 @@ +{cabal, HUnit, HaXml, MaybeT, parsec, sendfile, utf8String, mtl, network, hslogger, happstackData, happstackUtil, xhtml, html, zlib}: + +cabal.mkDerivation (self : { + pname = "happstack-server"; + version = "0.4.1"; + sha256 = "2a5d32b4e635160ffab8a90891d9c5ca0433969944ae4013ec8cebe25ba63658"; + propagatedBuildInputs = [ + HUnit HaXml MaybeT happstackData happstackUtil hslogger html + mtl network parsec sendfile utf8String xhtml zlib + ]; + meta = { + description = "Web related tools and services"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix new file mode 100644 index 00000000000..4ba0854d37a --- /dev/null +++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix @@ -0,0 +1,17 @@ +{cabal, mtl, hslogger, HUnit, QuickCheck, strictConcurrency, + unixCompat, SMTPClient}: + +cabal.mkDerivation (self : { + pname = "happstack-util"; + version = "0.4.1"; + sha256 = "bb254140c30c39c420bc5a649da645f59df950f0a712c2dac4de1cc6572f05f9"; + propagatedBuildInputs = [ + mtl hslogger HUnit QuickCheck strictConcurrency unixCompat + SMTPClient + ]; + meta = { + description = "Miscellaneous utilities for Happstack packages"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix new file mode 100644 index 00000000000..bce28aa71fa --- /dev/null +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -0,0 +1,14 @@ +{cabal, mtl, parsec}: + +cabal.mkDerivation (self : { + pname = "hsemail"; + version = "1.6"; + sha256 = "a8ba7e8cfb9213bb2ee61166bc8352e4353560d06f418a0c729aeb1d50b3a1fd"; + propagatedBuildInputs = [mtl parsec]; + meta = { + description = "Internet Message Parsers"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix new file mode 100644 index 00000000000..f35719d75f4 --- /dev/null +++ b/pkgs/development/libraries/haskell/sendfile/default.nix @@ -0,0 +1,14 @@ +{cabal, network}: + +cabal.mkDerivation (self : { + pname = "sendfile"; + version = "0.6.1"; + sha256 = "c21b7f0f9a03a5e6d9b0691f5f0be9969d175f0514becdc199f0fd49097e51a2"; + propagatedBuildInputs = [network]; + meta = { + description = "A portable sendfile library"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix index 6e43e157c37..5e90fd74e1a 100644 --- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix +++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "strict-concurrency"; - version = "0.2.1"; - sha256 = "8838600033bde2ce7ca6bd95a3815412da67244b57dfc0e2246a8f2469f5fd9c"; + version = "0.2.3"; + sha256 = "21641b983b226e47727ff565184a5f2b312c7979ff487a5e478f5cfc82f78f18"; propagatedBuildInputs = [parallel]; meta = { description = "Strict concurrency abstractions"; diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix index 5e9c4dff083..e6ea92a169e 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "syb-with-class"; - version = "0.5.1"; - sha256 = "71f8ada3f5c3a41cbbc73f11ba4d1ffd51509716657564f12856f94f041ecbd6"; + version = "0.6"; + sha256 = "8ee836b491b0f64ab0920d1a7314323439665a7b1afa78810cbbc95dc658bfdc"; meta = { description = "Scrap Your Boilerplate With Class"; }; diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix new file mode 100644 index 00000000000..ae1c54ec973 --- /dev/null +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "unix-compat"; + version = "0.1.2.1"; + sha256 = "553326e140f71f09cedeec5f74666171c2ad2b3d9ba4312da97da02cbf8a2e85"; + meta = { + description = "Portable POSIX-compatibility layer"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b731bef93a9..aebadc3cb2b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -224,6 +224,20 @@ rec { inherit cabal HaXml mtl network stm hslogger HAppSUtil HAppSData bytestring binary hspread; }; + /* cannot yet get this to work with 6.12.1 */ + happstackData = import ../development/libraries/haskell/happstack/happstack-data.nix { + inherit cabal mtl sybWithClass HaXml happstackUtil binary; + }; + + happstackUtil = import ../development/libraries/haskell/happstack/happstack-util.nix { + inherit cabal mtl hslogger QuickCheck HUnit strictConcurrency unixCompat SMTPClient; + }; + + happstackServer = import ../development/libraries/haskell/happstack/happstack-server.nix { + inherit cabal HUnit HaXml MaybeT parsec sendfile utf8String mtl hslogger happstackData happstackUtil xhtml html zlib; + network = network2217; + }; + hashedStorage = import ../development/libraries/haskell/hashed-storage { inherit cabal mtl zlib mmap; }; @@ -340,6 +354,10 @@ rec { inherit cabal; }; + hsemail = import ../development/libraries/haskell/hsemail { + inherit cabal mtl parsec; + }; + HStringTemplate = import ../development/libraries/haskell/HStringTemplate { inherit cabal parsec time; }; @@ -388,6 +406,10 @@ rec { inherit cabal benchpress; }; + MaybeT = import ../development/libraries/haskell/MaybeT { + inherit cabal mtl; + }; + MaybeTTransformers = import ../development/libraries/haskell/MaybeT-transformers { inherit cabal transformers monadsFd; }; @@ -567,6 +589,11 @@ rec { inherit cabal ghcPaths ghcSyb hslogger json multiset time uniplate; }; + sendfile = import ../development/libraries/haskell/sendfile { + inherit cabal; + network = network2217; + }; + syb = import ../development/libraries/haskell/syb { inherit cabal; }; @@ -611,6 +638,11 @@ rec { inherit cabal Shellac readline; }; + SMTPClient = import ../development/libraries/haskell/SMTPClient { + inherit cabal hsemail; + network = network2217; + }; + split = import ../development/libraries/haskell/split { inherit cabal; }; @@ -665,6 +697,10 @@ rec { inherit cabal; }; + unixCompat = import ../development/libraries/haskell/unix-compat { + inherit cabal; + }; + utf8String = import ../development/libraries/haskell/utf8-string { inherit cabal; }; @@ -843,7 +879,8 @@ rec { }; hslogger = import ../development/tools/haskell/hslogger { - inherit cabal mtl network time; + inherit cabal mtl time; + network = network2217; }; mkcabal = import ../development/tools/haskell/mkcabal { From 934b42972525eaefae8e7588f79e74725eb1efc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 15 Apr 2010 21:10:06 +0000 Subject: [PATCH 243/313] Updated gitit plus dependencies. svn path=/nixpkgs/trunk/; revision=21108 --- .../libraries/haskell/ConfigFile/default.nix | 14 ++++++ .../haskell/HStringTemplate/default.nix | 8 ++-- .../libraries/haskell/MissingH/default.nix | 14 ++++++ .../libraries/haskell/SHA/default.nix | 4 +- .../haskell/cautious-file/default.nix | 13 +++++ .../libraries/haskell/feed/default.nix | 14 ++++++ .../libraries/haskell/filestore/default.nix | 4 +- .../libraries/haskell/gitit/default.nix | 24 ++++++---- .../haskell/highlighting-kate/default.nix | 4 +- .../libraries/haskell/pandoc/default.nix | 11 +++-- .../libraries/haskell/texmath/default.nix | 14 ++++++ .../libraries/haskell/url/default.nix | 14 ++++++ .../libraries/haskell/xml/default.nix | 4 +- .../libraries/haskell/zip-archive/default.nix | 4 +- pkgs/top-level/haskell-packages.nix | 48 ++++++++++++++++--- 15 files changed, 161 insertions(+), 33 deletions(-) create mode 100644 pkgs/development/libraries/haskell/ConfigFile/default.nix create mode 100644 pkgs/development/libraries/haskell/MissingH/default.nix create mode 100644 pkgs/development/libraries/haskell/cautious-file/default.nix create mode 100644 pkgs/development/libraries/haskell/feed/default.nix create mode 100644 pkgs/development/libraries/haskell/texmath/default.nix create mode 100644 pkgs/development/libraries/haskell/url/default.nix diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix new file mode 100644 index 00000000000..3ad1f545067 --- /dev/null +++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix @@ -0,0 +1,14 @@ +{cabal, mtl, parsec, MissingH}: + +cabal.mkDerivation (self : { + pname = "ConfigFile"; + version = "1.0.6"; + sha256 = "339722184b86d53d8b361933e572b6e1478824c7eba3fb66b67d0eb5245cd038"; + propagatedBuildInputs = [mtl parsec MissingH]; + meta = { + description = "Configuration file reading & writing"; + license = "LGPL"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index 0d2d723ef08..ddf5740d95a 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -1,10 +1,10 @@ -{cabal, parsec, time}: +{cabal, parsec, time, text, utf8String, parallel}: cabal.mkDerivation (self : { pname = "HStringTemplate"; - version = "0.5.1.3"; - sha256 = "1f9da3afcb2441d450051ea9836f25df69430eaf17593c39199ad686a828e044"; - propagatedBuildInputs = [parsec time]; + version = "0.6.2"; + sha256 = "1d8ae847cb2b92f6d083ee1ed5db00c719e51fe43017d4289dea61335a116103"; + propagatedBuildInputs = [parsec time text utf8String parallel]; meta = { description = "StringTemplate implementation in Haskell"; }; diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix new file mode 100644 index 00000000000..252eb88c929 --- /dev/null +++ b/pkgs/development/libraries/haskell/MissingH/default.nix @@ -0,0 +1,14 @@ +{cabal, HUnit, hslogger, network, parsec, regexCompat}: + +cabal.mkDerivation (self : { + pname = "MissingH"; + version = "1.1.0.3"; + sha256 = "2d566511e8a347189cf864188d97f8406c6958c6f0a6fcf8cb1593c6bae13dbf"; + propagatedBuildInputs = [HUnit hslogger network parsec regexCompat]; + meta = { + description = "Large utility library"; + license = "GPL"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index 2d51cddca74..f958ec713a1 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "SHA"; - version = "1.4.0"; - sha256 = "7f08042fddadd8e3795d627a042d1884b33e066ab67d03b6de92551a4ad9fc7d"; + version = "1.4.1.1"; + sha256 = "8ecdc91679d1aa1d4050e1124cf5af79ae2ece66aee3b907e1078d71bf03169a"; propagatedBuildInputs = [binary]; meta = { description = "Implementations of the SHA suite of message digest functions"; diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix new file mode 100644 index 00000000000..16fe6672bc7 --- /dev/null +++ b/pkgs/development/libraries/haskell/cautious-file/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "cautious-file"; + version = "0.1.5"; + sha256 = "0d7b7bf530476b89ffc22bf6e586402b0fd6fd5571cc941df08838c5a890ad01"; + meta = { + description = "Ways to write a file cautiously"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix new file mode 100644 index 00000000000..7ba92613c5e --- /dev/null +++ b/pkgs/development/libraries/haskell/feed/default.nix @@ -0,0 +1,14 @@ +{cabal, utf8String, xml}: + +cabal.mkDerivation (self : { + pname = "feed"; + version = "0.3.7"; + sha256 = "c2d539f763cdce1b1498f1fd0707b12078337aff690f01e41db0b6e3569c08aa"; + propagatedBuildInputs = [utf8String xml]; + meta = { + description = "Interfacing with RSS and Atom feeds"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index db84d059782..2d3fc926857 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "filestore"; - version = "0.3.1"; - sha256 = "f18baafb50367d8d0a0e8da2873fd97033bb763d8776473e594c84c079017aa0"; + version = "0.3.4.1"; + sha256 = "ad04333fae938ae7de747457a6bdee30c6e4b700733265dbd1f4f8ee363c8230"; propagatedBuildInputs = [datetime parsec regexPosix split time utf8String xml Diff]; meta = { description = "Interface for versioning file stores"; diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index bee6f3fb564..5bebdf7de35 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -1,17 +1,23 @@ -{cabal, HAppSServer, HStringTemplate, HTTP, SHA, cgi, datetime, - filestore, highlightingKate, mtl, network, pandoc, parsec, - recaptcha, utf8String, xhtml, zlib}: +{cabal, happstackServer, happstackUtil, HStringTemplate, HTTP, + SHA, cgi, datetime, + filestore, highlightingKate, safe, mtl, network, pandoc, parsec, + recaptcha, utf8String, xhtml, zlib, ConfigFile, url, + cautiousFile, feed}: cabal.mkDerivation (self : { pname = "gitit"; - version = "0.5.3"; - sha256 = "d8e1c319e52edc6f2e92d1d22b8995f38b31f6aa0b6649aa73877e889ff45851"; - propagatedBuildInputs = - [HAppSServer HStringTemplate HTTP SHA cgi datetime filestore - highlightingKate mtl network pandoc parsec recaptcha utf8String - xhtml zlib]; + version = "0.7.3.5"; + sha256 = "50cf6b853d439904e54884660eba6ffdc31b938e077fd0d9457fba972d4bde9f"; + propagatedBuildInputs = [ + HStringTemplate happstackServer happstackUtil HTTP SHA cgi datetime + filestore highlightingKate safe + mtl network pandoc parsec recaptcha utf8String xhtml zlib ConfigFile + url cautiousFile feed + ]; meta = { description = "Wiki using HAppS, git or darcs, and pandoc"; + license = "GPL"; + maintainers = [self.stdenv.lib.maintainers.andres]; }; }) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index f94f768febb..d6d69f398ba 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "highlighting-kate"; - version = "0.2.5"; - sha256 = "0a11f29a61b9c907d3b79540e0b2ac3b6194bd4bc37b6405973cd9eeb7a9a868"; + version = "0.2.6.2"; + sha256 = "3ed163888d45d5bf5ee5c2931e894f6ca2eb167a79ac8274d7f57341c4c5dca7"; propagatedBuildInputs = [parsec pcreLight xhtml]; meta = { description = "Syntax highlighting"; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 1e7ab185bd7..de77d27c8b0 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,10 +1,13 @@ -{cabal, mtl, network, parsec, utf8String, xhtml, zipArchive}: +{cabal, mtl, network, parsec, utf8String, xhtml, zipArchive, HTTP, xml, + texmath}: cabal.mkDerivation (self : { pname = "pandoc"; - version = "1.2"; - sha256 = "e922c8f4765a8d105abf30dbe21a73961357929cd2fb8dfd323f0f62ca0723b4"; - propagatedBuildInputs = [mtl network parsec utf8String xhtml zipArchive]; + version = "1.5.1.1"; + sha256 = "6d2283cb618fcaea5ee5cb885ef6532bc34628b351f14a6bd85b098d7a4128d9"; + propagatedBuildInputs = [ + mtl network parsec utf8String xhtml zipArchive HTTP xml texmath + ]; meta = { description = "Conversion between markup formats"; }; diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix new file mode 100644 index 00000000000..66369cb60ba --- /dev/null +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -0,0 +1,14 @@ +{cabal, cgi, json, parsec, xml}: + +cabal.mkDerivation (self : { + pname = "texmath"; + version = "0.2.0.3"; + sha256 = "d355a298d28b9f5356926c2d2942f28ed07afa9d944cadfa47d8cdec73725b55"; + propagatedBuildInputs = [cgi json parsec xml]; + meta = { + description = "Conversion of LaTeX math formulas to MathML"; + license = "GPL"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix new file mode 100644 index 00000000000..d82af144515 --- /dev/null +++ b/pkgs/development/libraries/haskell/url/default.nix @@ -0,0 +1,14 @@ +{cabal, utf8String}: + +cabal.mkDerivation (self : { + pname = "url"; + version = "2.1.2"; + sha256 = "2cf5c4296418afe3940ae4de66d867897b1382cc4d37a0b9a5ccffa16743ef91"; + propagatedBuildInputs = [utf8String]; + meta = { + description = "A library for working with URLs"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix index 275f6e6d5b0..096934dfeae 100644 --- a/pkgs/development/libraries/haskell/xml/default.nix +++ b/pkgs/development/libraries/haskell/xml/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "xml"; - version = "1.3.4"; - sha256 = "87da09814e79d8d1f31eba4936b291d4522224187d44e1e085839726f0e7a0dd"; + version = "1.3.5"; + sha256 = "d61abd617e6e4d5b384e19403486ecc0e5dccf412a235acce2a7b7072e97c3ab"; meta = { description = "A simple XML library"; }; diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index 11a7675c0d2..23fb5045cd4 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "zip-archive"; - version = "0.1.1.3"; - sha256 = "2caa3e6020c394c740b942685306c71e91bebf6e499627dc20fdf0ac7925a57a"; + version = "0.1.1.6"; + sha256 = "16aafc5f74c880398413a7c2adaaf90cae86006dcda58f663c1e1d795add90aa"; propagatedBuildInputs = [binary mtl utf8String zlib digest]; meta = { description = "Library for creating and modifying zip archives"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index aebadc3cb2b..8c48865a634 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -65,6 +65,10 @@ rec { inherit cabal bytestring network; }; + cautiousFile = import ../development/libraries/haskell/cautious-file { + inherit cabal; + }; + cgi3001172 = import ../development/libraries/haskell/cgi/3001.1.7.2.nix { inherit cabal mtl parsec xhtml; network = network2217; @@ -78,6 +82,10 @@ rec { inherit cabal ansiTerminal haskellLexer; }; + ConfigFile = import ../development/libraries/haskell/ConfigFile { + inherit cabal mtl parsec MissingH; + }; + convertible = import ../development/libraries/haskell/convertible { inherit cabal mtl; time = time113; @@ -148,6 +156,10 @@ rec { inherit cabal monadsFd; }; + feed = import ../development/libraries/haskell/feed { + inherit cabal utf8String xml; + }; + filestore = import ../development/libraries/haskell/filestore { inherit cabal datetime parsec regexPosix split time utf8String xml Diff; }; @@ -179,9 +191,15 @@ rec { }; gitit = import ../development/libraries/haskell/gitit { - inherit cabal HAppSServer HStringTemplate HTTP SHA cgi datetime - filestore highlightingKate mtl network pandoc parsec recaptcha - utf8String xhtml zlib; + inherit cabal happstackServer happstackUtil + HStringTemplate SHA datetime + filestore highlightingKate safe + mtl pandoc parsec recaptcha + utf8String xhtml zlib ConfigFile url + cautiousFile feed; + cgi = cgi3001172; + HTTP = HTTP400009; + network = network2217; }; GLUT2121 = import ../development/libraries/haskell/GLUT/2.1.2.1.nix { @@ -359,7 +377,7 @@ rec { }; HStringTemplate = import ../development/libraries/haskell/HStringTemplate { - inherit cabal parsec time; + inherit cabal parsec time text utf8String parallel; }; hspread = import ../development/libraries/haskell/hspread { @@ -414,6 +432,11 @@ rec { inherit cabal transformers monadsFd; }; + MissingH = import ../development/libraries/haskell/MissingH { + inherit cabal HUnit hslogger parsec regexCompat; + network = network2217; + }; + mmap = import ../development/libraries/haskell/mmap { inherit cabal; }; @@ -480,7 +503,10 @@ rec { }; pandoc = import ../development/libraries/haskell/pandoc { - inherit cabal mtl network parsec utf8String xhtml zipArchive; + inherit cabal mtl parsec utf8String xhtml zipArchive + xml texmath; + HTTP = HTTP400009; + network = network2217; }; parallel2201 = import ../development/libraries/haskell/parallel/2.2.0.1.nix { @@ -536,7 +562,9 @@ rec { }; recaptcha = import ../development/libraries/haskell/recaptcha { - inherit cabal HTTP network xhtml; + inherit cabal xhtml; + HTTP = HTTP400009; + network = network2217; }; regexBase0931 = import ../development/libraries/haskell/regex-base/0.93.1.nix { @@ -668,6 +696,10 @@ rec { inherit cabal HUnit QuickCheck mtl; }; + texmath = import ../development/libraries/haskell/texmath { + inherit cabal cgi json parsec xml; + }; + text = import ../development/libraries/haskell/text { inherit cabal deepseq; }; @@ -701,6 +733,10 @@ rec { inherit cabal; }; + url = import ../development/libraries/haskell/url { + inherit cabal utf8String; + }; + utf8String = import ../development/libraries/haskell/utf8-string { inherit cabal; }; From bd22d01b5e9d777a7f621422c68d176b646ed630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 15 Apr 2010 22:01:04 +0000 Subject: [PATCH 244/313] Use consistent version of network package in gitit. svn path=/nixpkgs/trunk/; revision=21109 --- pkgs/top-level/haskell-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8c48865a634..4a977b852c5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -697,7 +697,8 @@ rec { }; texmath = import ../development/libraries/haskell/texmath { - inherit cabal cgi json parsec xml; + inherit cabal json parsec xml; + cgi = cgi3001172; }; text = import ../development/libraries/haskell/text { From 8a2edb8797b6d4b5f1747c718fedbc49ea1d215c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 15 Apr 2010 22:53:11 +0000 Subject: [PATCH 245/313] GNU Guile 1.9.10. svn path=/nixpkgs/trunk/; revision=21110 --- pkgs/development/interpreters/guile/1.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/guile/1.9.nix b/pkgs/development/interpreters/guile/1.9.nix index 084c7bc885d..94a396446f9 100644 --- a/pkgs/development/interpreters/guile/1.9.nix +++ b/pkgs/development/interpreters/guile/1.9.nix @@ -7,11 +7,11 @@ else stdenv.mkDerivation) rec { - name = "guile-1.9.9"; # This is a beta release! + name = "guile-1.9.10"; # This is a beta release! src = fetchurl { url = "ftp://alpha.gnu.org/gnu/guile/${name}.tar.gz"; - sha256 = "1il7jalgx1z5z3hicvs41nc8yls2hrcnfm3dcpr4kr8nzzmz28s9"; + sha256 = "0vdvxkwm0xi65cw77a3yzjvwp3s66p2cpgqgqvp8w46r4amv1zpy"; }; buildInputs = From 53ec513a91d72b2bed06babe5b15f36b426bcc32 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 16 Apr 2010 05:26:27 +0000 Subject: [PATCH 246/313] Recurse into gnome attrs svn path=/nixpkgs/trunk/; revision=21112 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index def01205718..ac69dfe7467 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8692,7 +8692,7 @@ let inherit stdenv fetchurl pkgconfig x11 xlibs dbus imlib2 freetype; }; - gnome28 = import ../desktops/gnome-2.28 pkgs; + gnome28 = recurseIntoAttrs (import ../desktops/gnome-2.28 pkgs); gnome = gnome28; From 2b42e23a647809d453516e665880729669dcacbf Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 16 Apr 2010 06:47:55 +0000 Subject: [PATCH 247/313] libgweather: added assertion svn path=/nixpkgs/trunk/; revision=21113 --- pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix index 2b76585287a..9ed8eb38d14 100644 --- a/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix +++ b/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup}: +assert stdenv ? glibc; + stdenv.mkDerivation { name = "libgweather-2.28.0"; src = fetchurl { From ecaa92decb88b3a8f6aa5ac3ccb9233f94112962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 16 Apr 2010 08:05:09 +0000 Subject: [PATCH 248/313] Remove `guile_1_9_coverage'. svn path=/nixpkgs/trunk/; revision=21116 --- pkgs/top-level/all-packages.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac69dfe7467..708009a51f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2573,12 +2573,6 @@ let libunistring pkgconfig boehmgc libffi; }; - guile_1_9_coverage = import ../development/interpreters/guile/1.9.nix { - inherit fetchurl stdenv readline libtool gmp gawk makeWrapper - libunistring pkgconfig boehmgc libffi; - inherit (releaseTools) coverageAnalysis; - }; - io = builderDefsPackage (import ../development/interpreters/io) { inherit sqlite zlib gmp libffi cairo ncurses freetype mesa libpng libtiff libjpeg readline libsndfile libxml2 From 3874ba79bdd4a2d39786835725e76488642c82e0 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Fri, 16 Apr 2010 15:56:25 +0000 Subject: [PATCH 249/313] make pythonPackages default to pyhton26Packages because python26 is default now This makes python packages passed to inkscape have same version again svn path=/nixpkgs/trunk/; revision=21130 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 708009a51f1..d5135e8082c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5291,7 +5291,9 @@ let setuptools = setuptools_python26; }; - pythonPackages = recurseIntoAttrs (import ./python-packages.nix { + pythonPackages = python26Packages; + + python25Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs python buildPythonPackage; }); From 6ce15d655f6296ec8626b1ec1296a4101687dee0 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Fri, 16 Apr 2010 15:56:28 +0000 Subject: [PATCH 250/313] adding wvdial, wvstreams, usb_modeswitch svn path=/nixpkgs/trunk/; revision=21131 --- .../libraries/wvstreams/default.nix | 23 +++++++++++++ .../tools/misc/usb-modeswitch/default.nix | 32 +++++++++++++++++++ pkgs/os-specific/linux/wvdial/default.nix | 26 +++++++++++++++ pkgs/top-level/all-packages.nix | 12 +++++++ 4 files changed, 93 insertions(+) create mode 100644 pkgs/development/libraries/wvstreams/default.nix create mode 100644 pkgs/development/tools/misc/usb-modeswitch/default.nix create mode 100644 pkgs/os-specific/linux/wvdial/default.nix diff --git a/pkgs/development/libraries/wvstreams/default.nix b/pkgs/development/libraries/wvstreams/default.nix new file mode 100644 index 00000000000..28bab029172 --- /dev/null +++ b/pkgs/development/libraries/wvstreams/default.nix @@ -0,0 +1,23 @@ +args: with args; +stdenv.mkDerivation { + name = "wvstreams-4.6.1"; + + src = fetchurl { + url = http://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz; + sha256 = "0cvnq3mvh886gmxh0km858aqhx30hpyrfpg1dh6ara9sz3xza0w4"; + }; + + preConfigure = '' + find -type f | xargs sed -i 's@/bin/bash@bash@g' + ''; + + buildInputs = [qt4 dbus zlib openssl readline perl]; + + meta = { + description = "network programming library in C++"; + homepage = http://alumnit.ca/wiki/index.php?page=WvStreams; + license = "LGPL"; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix new file mode 100644 index 00000000000..c93756ffa25 --- /dev/null +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -0,0 +1,32 @@ +args: with args; + +stdenv.mkDerivation { + + name = "usb-modeswitch-1.1.1"; + + src = /tmp/marc/usb-modeswitch-1.1.1.tar.bz2; + /* + fetchurl { + url = + sha256 = "0f7da588yvb1d3l3gk5m0hrqlhg8m4gw93aip3dwkmnawz9r0qca"; + }; + */ + + # make clean: we always build from source. It should be necessary on x86_64 only + preConfigure = '' + find -type f | xargs sed 's@/bin/rm@rm@g' -i + make clean + ensureDir $out/{etc,lib/udev,share/man/man1} + makeFlags="DESTDIR=$out PREFIX=$out" + ''; + + buildInputs = [libusb]; + + meta = { + description = "..."; + homepage = "TODO"; + license = "GPLv2"; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/wvdial/default.nix b/pkgs/os-specific/linux/wvdial/default.nix new file mode 100644 index 00000000000..bc88d56ae31 --- /dev/null +++ b/pkgs/os-specific/linux/wvdial/default.nix @@ -0,0 +1,26 @@ +args: with args; +stdenv.mkDerivation { + name = "wvdial-1.16"; + + src = fetchurl { + url = http://wvstreams.googlecode.com/files/wvdial-1.61.tar.gz; + sha256 = "0mzcrv8mc60gbdrixc9k8ammbslvjb9x2cs50yf1jq67aabapzsg"; + }; + + buildInputs = [wvstreams pkgconfig]; + + preConfigure = '' + find -type f | xargs sed -i 's@/bin/bash@bash@g' + export makeFlags="prefix=$out" + # not sure about this line + sed -i 's@/etc/ppp/peers@$out/etc/ppp/peers@' Makefile.in + ''; + + meta = { + description = "dialer automatically recognizing the modem"; + homepage = http://alumnit.ca/wiki/index.php?page=WvDial; + license = "LGPL"; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5135e8082c..c14105c6068 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -524,6 +524,10 @@ let inherit fetchurl stdenv; }; + usb_modeswitch = import ../development/tools/misc/usb-modeswitch { + inherit stdenv fetchurl libusb; + }; + cloogppl = import ../development/libraries/cloog-ppl { inherit fetchurl stdenv ppl; }; @@ -5067,6 +5071,10 @@ let inherit (xlibs) libXt; }; + wvstreams = import ../development/libraries/wvstreams { + inherit stdenv fetchurl qt4 dbus zlib openssl readline perl; + }; + wxGTK = wxGTK28; wxGTK26 = import ../development/libraries/wxGTK-2.6 { @@ -7249,6 +7257,10 @@ let inherit fetchurl stdenv perl pkgconfig libpcap flex bison; inherit (gtkLibs) gtk; }; + + wvdial = import ../os-specific/linux/wvdial { + inherit stdenv fetchurl wvstreams pkgconfig; + }; fbida = builderDefsPackage ../applications/graphics/fbida { inherit libjpeg libexif giflib libtiff libpng From a772868bca90715486175ae370490d4afaa77d9b Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Fri, 16 Apr 2010 15:56:31 +0000 Subject: [PATCH 251/313] adding svnFS svn path=/nixpkgs/trunk/; revision=21132 --- pkgs/tools/filesystems/svnfs/default.nix | 28 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/filesystems/svnfs/default.nix diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix new file mode 100644 index 00000000000..c4cd2670e89 --- /dev/null +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -0,0 +1,28 @@ +args: with args; +stdenv.mkDerivation { + name = "svnfs"; + + src = fetchurl { + url = http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-0.4.tgz; + sha256 = "1lrzjr0812lrnkkwk60bws9k1hq2iibphm0nhqyv26axdsygkfky"; + }; + + buildInputs = [automake autoconf subversion fuse apr perl]; + + # why is this required? + preConfigure='' + export LD_LIBRARY_PATH=${subversion}/lib + ''; + + + NIX_CFLAGS_COMPILE="-I ${subversion}/include/subversion-1"; + NIX_LDFLAGS="-lsvn_client-1"; + + meta = { + description = "SvnFs is a filesystem written using FUSE for accessing Subversion repositories"; + homepage = http://www.jmadden.eu/index.php/svnfs/; + license = "GPLv2"; + maintainers = [args.lib.maintainers.marcweber]; + platforms = args.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c14105c6068..8733a55afe6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1627,6 +1627,10 @@ let inherit (perlPackages) LWP URI HTMLParser HTTPServerSimple Parent; }; + svnFS = import ../tools/filesystems/svnfs { + inherit fetchurl stdenv automake autoconf perl fuse subversion apr; + }; + system_config_printer = import ../tools/misc/system-config-printer { inherit stdenv fetchurl perl perlXMLParser desktop_file_utils; }; From 71f2fc2324b23a242220b0e0c7024b8504f6f25a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 16 Apr 2010 17:34:01 +0000 Subject: [PATCH 252/313] Fix the upstream-update snippets.sh for sourceforge URLs (sourceforge changed the url pattern) svn path=/nixpkgs/trunk/; revision=21133 --- pkgs/build-support/upstream-updater/snippets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/upstream-updater/snippets.sh b/pkgs/build-support/upstream-updater/snippets.sh index b89b80219a9..dad25384568 100644 --- a/pkgs/build-support/upstream-updater/snippets.sh +++ b/pkgs/build-support/upstream-updater/snippets.sh @@ -2,7 +2,7 @@ #http://sourceforge.net/projects/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz/download #http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz -skipRedirectSF='s@^http://sourceforge.net/projects/@http://downloads.sourceforge.net/@; s@/download$@@' +skipRedirectSF='s@sourceforge.net/projects@downloads.sourceforge.net/project@; s@/files@@; s@/download$@@;' extractReleaseSF='s@.*/([^/]+)/[^/]+@\1@' apacheMirror='s@http://www.apache.org/dist/@mirror://apache/@' skipRedirectApache='s@/dyn/closer.cgi[?]path=@/dist@' From d6f653770b72d4ae17a60126c43bc5a58c680c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 16 Apr 2010 17:35:26 +0000 Subject: [PATCH 253/313] Updating the 'ecl' url (new version, and updated sourceforge url scheme) svn path=/nixpkgs/trunk/; revision=21134 --- pkgs/development/compilers/ecl/src-for-default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ecl/src-for-default.nix b/pkgs/development/compilers/ecl/src-for-default.nix index bfd9f53ad09..7a90597f5c8 100644 --- a/pkgs/development/compilers/ecl/src-for-default.nix +++ b/pkgs/development/compilers/ecl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="10.2.1"; - name="ecl-10.2.1"; - hash="1y917ql2dlcg8di1bwhph7zmqaj3c9ywv1iwkdkkfq1ylbn939bj"; - url="http://downloads.sourceforge.net/ecls/files/ecls/10.2/ecl-${version}.tgz"; - advertisedUrl="http://downloads.sourceforge.net/ecls/files/ecls/10.2/ecl-10.2.1.tgz"; + version="10.4.1"; + name="ecl-10.4.1"; + hash="0v1wqvvi2zvvmymsgxz7yvqbxf8py6kxani2f4i3bjkayblcypah"; + url="http://downloads.sourceforge.net/project/ecls/ecls/10.4/ecl-${version}.tar.gz"; + advertisedUrl="http://downloads.sourceforge.net/project/ecls/ecls/10.4/ecl-10.4.1.tar.gz"; } From 21d2c514e5a6b87941980684e1880b6100170c95 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 16 Apr 2010 19:23:25 +0000 Subject: [PATCH 254/313] * libcdio updated to 0.82. svn path=/nixpkgs/trunk/; revision=21136 --- pkgs/development/libraries/libcdio/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 74254160edb..fc26fb9aca1 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,20 +1,20 @@ -{fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man}: +{ fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }: stdenv.mkDerivation rec { - name = "libcdio-0.80"; + name = "libcdio-0.82"; src = fetchurl { url = "mirror://gnu/libcdio/${name}.tar.gz"; - sha256 = "0rnayw7gcq6jii2xrgg2n4wa8bsf5rw2hcww214lc0ssvcs1m95i"; + sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs"; }; - buildInputs = [libcddb pkgconfig ncurses help2man]; + buildInputs = [ libcddb pkgconfig ncurses help2man ]; # Disabled because one test (check_paranoia.sh) fails. #doCheck = true; meta = { - description = "A library for OS-idependent CD-ROM and CD image access"; + description = "A library for OS-independent CD-ROM and CD image access"; longDescription = '' GNU libcdio is a library for OS-idependent CD-ROM and CD image access. It includes a library for working with From 10fdd4d2301d77396b7869aa8d3d814c7e8e8334 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 16 Apr 2010 19:26:15 +0000 Subject: [PATCH 255/313] * Updated audacious to 2.3. Combined audacious and audacious-plugins into one derivation so that it works out of the box - no need to set symlinks to the plugins in ~/.local/share/audacious. There is really no reason to install those packages separately anyway, as audacious is useless without the plugins package. svn path=/nixpkgs/trunk/; revision=21137 --- pkgs/applications/audio/audacious/default.nix | 54 +++++++++++++++++++ pkgs/applications/audio/audacious/player.nix | 32 ----------- pkgs/applications/audio/audacious/plugins.nix | 33 ------------ pkgs/top-level/all-packages.nix | 13 ++--- pkgs/top-level/release.nix | 1 - 5 files changed, 58 insertions(+), 75 deletions(-) create mode 100644 pkgs/applications/audio/audacious/default.nix delete mode 100644 pkgs/applications/audio/audacious/player.nix delete mode 100644 pkgs/applications/audio/audacious/plugins.nix diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix new file mode 100644 index 00000000000..48ee3ed1d8d --- /dev/null +++ b/pkgs/applications/audio/audacious/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, pkgconfig, glib, gtk, libmowgli, libmcs +, gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg +, libvorbis, libcdio, libcddb, flac +}: + +stdenv.mkDerivation rec { + name = "audacious-2.3"; + + src = fetchurl { + url = "http://distfiles.atheme.org/${name}.tgz"; + sha256 = "0vs16y1vrlkzcbaw8imc36b9lncva69zkdkp38ikbidssiskm6xi"; + }; + + pluginsSrc = fetchurl { + url = "http://distfiles.atheme.org/audacious-plugins-2.3.tgz"; + sha256 = "0hdami52qpiyim3nz3qnml85wgjzpmx6g2wahfnsdvncmhm4v93x"; + }; + + # `--enable-amidiplug' is to prevent configure from looking in /proc/asound. + configureFlags = "--enable-amidiplug"; + + buildInputs = + [ gettext pkgconfig glib gtk libmowgli libmcs libxml2 dbus_glib + libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio + libcddb + ]; + + # Here we build bouth audacious and audacious-plugins in one + # derivations, since they really expect to be in the same prefix. + # This is slighly tricky. + builder = builtins.toFile "builder.sh" + '' + # First build audacious. + ( + source $stdenv/setup + genericBuild + ) + + # Then build the plugins. + ( + buildNativeInputs="$out $buildNativeInputs" # to find audacious + source $stdenv/setup + rm -rfv audacious-* + src=$pluginsSrc + genericBuild + ) + ''; + + meta = { + description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork"; + homepage = http://audacious-media-player.org/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/applications/audio/audacious/player.nix b/pkgs/applications/audio/audacious/player.nix deleted file mode 100644 index 836882a79c5..00000000000 --- a/pkgs/applications/audio/audacious/player.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, libmowgli -, libglade, libmcs, gettext, xlibs, dbus_glib -}: - -stdenv.mkDerivation { - name = "audacious-1.5.1"; - - src = fetchurl { - url = http://distfiles.atheme.org/audacious-1.5.1.tbz2; - sha256 = "1s32pdgx85qkrq15wwmvdw7wbcbxcf3nrhqxi6y72aijqm6fjwnz"; - }; - - buildInputs = [pkgconfig libglade libmcs gettext dbus_glib]; - - propagatedBuildInputs = [glib gtk libmowgli libmcs]; - - NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib"; - - # Otherwise we barf with "libgcc_s.so.1 must be installed for - # pthread_cancel to work" on exit, as it tries to find libgcc_s - # dynamically. - dontPatchELF = true; - - preBuild = '' - ensureDir $out/lib - ''; - - meta = { - description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork"; - homepage = http://audacious-media-player.org/; - }; -} diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/applications/audio/audacious/plugins.nix deleted file mode 100644 index 649b8105536..00000000000 --- a/pkgs/applications/audio/audacious/plugins.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, audacious, dbus_glib, gettext -, libmad, xlibs, alsaLib, taglib, libmpcdec, libogg, libvorbis -, libcdio, libcddb, libxml2 -}: - -stdenv.mkDerivation { - name = "audacious-plugins-1.5.1"; - - src = fetchurl { - url = http://distfiles.atheme.org/audacious-plugins-1.5.1.tbz2; - sha256 = "1ki5bd50g4vi4d0qzxynyrgaq2n4cwhbsxln9rwk8ppphvk9pawc"; - }; - - buildInputs = [ - pkgconfig audacious dbus_glib gettext libmad - xlibs.libXcomposite alsaLib taglib libmpcdec - libogg libvorbis libcdio libcddb libxml2 - ]; - - preBuild = '' - makeFlagsArray=(pluginlibdir=$out/lib/audacious) - ''; - - NIX_LDFLAGS = "-L${audacious}/lib/audacious"; # needed because we override pluginlibdir - - # `--enable-amidiplug' is to prevent configure from looking in /proc/asound. - configureFlags = "--enable-amidiplug"; - - meta = { - description = "Plugins for the Audacious media player"; - homepage = http://audacious-media-player.org/; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8733a55afe6..56a44e722b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6759,18 +6759,13 @@ let inherit (gnome) libgnomecanvas; }; - audacious = import ../applications/audio/audacious/player.nix { - inherit fetchurl stdenv pkgconfig libmowgli libmcs gettext xlibs dbus_glib; - inherit (gnome) libglade; + audacious = import ../applications/audio/audacious { + inherit fetchurl stdenv gettext pkgconfig libmowgli libmcs + dbus_glib libxml2 libmad xlibs alsaLib libogg libvorbis libcdio + libcddb flac; inherit (gtkLibs) glib gtk; }; - audacious_plugins = import ../applications/audio/audacious/plugins.nix { - inherit fetchurl stdenv pkgconfig audacious dbus_glib gettext - libmad xlibs alsaLib taglib libmpcdec libogg libvorbis - libcdio libcddb libxml2; - }; - audacity = import ../applications/audio/audacity { inherit fetchurl stdenv gettext pkgconfig zlib perl intltool libogg libvorbis libmad; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index a320c5a4bc2..204c4220738 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -16,7 +16,6 @@ with (import ./release-lib.nix); aterm25 = all; aterm28 = all; audacious = linux; - audacious_plugins = linux; autoconf = all; automake110x = all; automake111x = all; From 7c22881aa8adf1dbd2f60960189c239b70e92f0e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 16 Apr 2010 20:19:22 +0000 Subject: [PATCH 256/313] * Build audacious with ffmpeg to get support for WMA and MPC. svn path=/nixpkgs/trunk/; revision=21138 --- pkgs/applications/audio/audacious/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 48ee3ed1d8d..08548aa8b57 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, gtk, libmowgli, libmcs , gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg -, libvorbis, libcdio, libcddb, flac +, libvorbis, libcdio, libcddb, flac, ffmpeg }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext pkgconfig glib gtk libmowgli libmcs libxml2 dbus_glib libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio - libcddb + libcddb ffmpeg ]; # Here we build bouth audacious and audacious-plugins in one diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56a44e722b7..f2145a2f282 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6762,7 +6762,7 @@ let audacious = import ../applications/audio/audacious { inherit fetchurl stdenv gettext pkgconfig libmowgli libmcs dbus_glib libxml2 libmad xlibs alsaLib libogg libvorbis libcdio - libcddb flac; + libcddb flac ffmpeg; inherit (gtkLibs) glib gtk; }; From 36623b8227ea86869c99fe9a09c038eb5d1d74c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 17 Apr 2010 10:15:47 +0000 Subject: [PATCH 257/313] Updating openocd and libftdi (for the sheevaplug jtag) svn path=/nixpkgs/trunk/; revision=21139 --- pkgs/development/libraries/libftdi/default.nix | 4 ++-- pkgs/development/tools/misc/openocd/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 4667f44b188..6805434dcec 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libusb}: stdenv.mkDerivation rec { - name = "libftdi-0.16"; + name = "libftdi-0.17"; src = fetchurl { url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz"; - sha256 = "1n12lcvpzmkph12gmg7i7560s0yly2gjgwhxh2h2inq93agg1xv2"; + sha256 = "1w5bzq4h4v9qah9dx0wbz6w7ircr91ack0sh6wqs8s5b4m8jgh6m"; }; buildInputs = [ libusb ]; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 1e7cdeb39f4..c6f34f8e837 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libftdi}: stdenv.mkDerivation { - name = "openocd-0.3.1"; + name = "openocd-0.4.0"; src = fetchurl { - url = "http://download.berlios.de/openocd/openocd-0.3.1.tar.bz2"; - sha256 = "1ww66gj4mn3ih4k0b2w21795gfl6g53nm41irii9n7bbjn2dmgrp"; + url = "http://download.berlios.de/openocd/openocd-0.4.0.tar.bz2"; + sha256 = "1c9j8s3mqgw5spv6nd4lqfkd1l9jmjipi0ya054vnjfsy2617kzv"; }; From 9e59164e5747235892f81ed6b6db67c63be89fe5 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sat, 17 Apr 2010 18:26:40 +0000 Subject: [PATCH 258/313] adding lib function haskell's drop x elements from head of list svn path=/nixpkgs/trunk/; revision=21141 --- pkgs/lib/lists.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index 6141ad413d3..9b8334a5b9d 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -167,6 +167,11 @@ rec { if list == [] || count == 0 then [] else [ (head list) ] ++ take (builtins.sub count 1) (tail list); + # haskell's drop. drop count elements from head of list + drop = count: list: + if count == 0 then list + else drop (builtins.sub count 1) (tail list); + last = list: assert list != []; let loop = l: if tail l == [] then head l else loop (tail l); in From 8c0b7e4ad2c23b3bb9c71c431520096d4361942f Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sat, 17 Apr 2010 18:28:25 +0000 Subject: [PATCH 259/313] - adding experimental python31 build - cleanup python libraries: * moving all python libraries into a attr set into a directory so that expressions can be used for both: python 2.5 and 2.6 easily * disabling packages which don't build svn path=/nixpkgs/trunk/; revision=21142 --- .../interpreters/python/3.1/default.nix | 95 ++ .../interpreters/python/3.1/search-path.patch | 27 + .../interpreters/python/3.1/setup-hook.sh | 15 + .../python-modules/zope/default.nix | 15 - .../4suite/default.nix | 0 .../ZopeInterface/default.nix | 12 + .../bsddb3/default.nix | 0 .../dbus/default.nix | 0 pkgs/development/python2-packages/default.nix | 876 ++++++++++++++++++ .../flup/default.nix | 0 .../generic/default.nix | 0 .../irclib/default.nix | 0 .../libsexy/default.nix | 0 .../numeric/default.nix | 0 .../pil/default.nix | 0 .../psyco/default.nix | 0 .../pycairo/default.nix | 0 .../pycrypto/default.nix | 0 .../pycups/default.nix | 0 .../pygame/default.nix | 0 .../pygobject/default.nix | 0 .../pygtk/default.nix | 0 .../python2-packages/pyopengl/default.nix | 38 + .../pyopenssl/default.nix | 0 .../development/python2-packages/pyqt/4.5.nix | 22 + .../pyqt/4.7.nix} | 0 .../python-sip/4.10.nix} | 0 .../python2-packages/python-sip/default.nix | 20 + .../pyx/default.nix | 0 .../pyxml/default.nix | 0 .../rhpl/builder.sh | 0 .../rhpl/default.nix | 0 .../setuptools/default.nix | 0 .../stringtemplate/default.nix | 0 .../wxPython/2.6.nix | 0 .../wxPython/2.8.nix | 0 .../wxPython/builder.sh | 0 .../xmpppy/default.nix | 0 .../zope/zope_python-2.4.4.patch | 0 .../zope/zope_python-readline.patch | 0 pkgs/top-level/all-packages.nix | 212 +---- 41 files changed, 1154 insertions(+), 178 deletions(-) create mode 100644 pkgs/development/interpreters/python/3.1/default.nix create mode 100644 pkgs/development/interpreters/python/3.1/search-path.patch create mode 100644 pkgs/development/interpreters/python/3.1/setup-hook.sh delete mode 100644 pkgs/development/python-modules/zope/default.nix rename pkgs/development/{python-modules => python2-packages}/4suite/default.nix (100%) create mode 100644 pkgs/development/python2-packages/ZopeInterface/default.nix rename pkgs/development/{python-modules => python2-packages}/bsddb3/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/dbus/default.nix (100%) create mode 100644 pkgs/development/python2-packages/default.nix rename pkgs/development/{python-modules => python2-packages}/flup/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/generic/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/irclib/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/libsexy/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/numeric/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/pil/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/psyco/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/pycairo/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/pycrypto/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/pycups/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/pygame/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/pygobject/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/pygtk/default.nix (100%) create mode 100644 pkgs/development/python2-packages/pyopengl/default.nix rename pkgs/development/{python-modules => python2-packages}/pyopenssl/default.nix (100%) create mode 100644 pkgs/development/python2-packages/pyqt/4.5.nix rename pkgs/development/{python-modules/pyqt/default.nix => python2-packages/pyqt/4.7.nix} (100%) rename pkgs/development/{python-modules/python-sip/default.nix => python2-packages/python-sip/4.10.nix} (100%) create mode 100644 pkgs/development/python2-packages/python-sip/default.nix rename pkgs/development/{python-modules => python2-packages}/pyx/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/pyxml/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/rhpl/builder.sh (100%) rename pkgs/development/{python-modules => python2-packages}/rhpl/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/setuptools/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/stringtemplate/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/wxPython/2.6.nix (100%) rename pkgs/development/{python-modules => python2-packages}/wxPython/2.8.nix (100%) rename pkgs/development/{python-modules => python2-packages}/wxPython/builder.sh (100%) rename pkgs/development/{python-modules => python2-packages}/xmpppy/default.nix (100%) rename pkgs/development/{python-modules => python2-packages}/zope/zope_python-2.4.4.patch (100%) rename pkgs/development/{python-modules => python2-packages}/zope/zope_python-readline.patch (100%) diff --git a/pkgs/development/interpreters/python/3.1/default.nix b/pkgs/development/interpreters/python/3.1/default.nix new file mode 100644 index 00000000000..8f3a94e137e --- /dev/null +++ b/pkgs/development/interpreters/python/3.1/default.nix @@ -0,0 +1,95 @@ +{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 +, gdbmSupport ? true, gdbm ? null +, sqlite ? null +, db4 ? null +, readline ? null +, openssl ? null +, tk ? null +, tcl ? null +, libX11 ? null +, xproto ? null +, arch ? null +, sw_vers ? null +}: + +# I haven't spend much time on this derivation. So some of these settings may not apply to python-3.1 +# + +assert zlibSupport -> zlib != null; +assert gdbmSupport -> gdbm != null; +assert stdenv.isDarwin -> arch != null; +assert stdenv.isDarwin -> sw_vers != null; + +with stdenv.lib; + +let + + majorVersion = "3.1"; + version = "${majorVersion}.1"; + + buildInputs = + optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ + [bzip2] + ++ optional zlibSupport zlib + ++ optional gdbmSupport gdbm + ++ optional (sqlite != null) sqlite + ++ optional (db4 != null) db4 + ++ optional (readline != null) readline + ++ optional (openssl != null) openssl + ++ optional (tk != null) tk + ++ optional (tcl != null) tcl + ++ optional (libX11 != null) libX11 + ++ optional (xproto != null) xproto + ++ optional (arch != null) arch + ++ optional (sw_vers != null) sw_vers + ; + +in + +stdenv.mkDerivation ( { + name = "python-${version}"; + + src = fetchurl { + url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; + sha256 = "1zai7damkpbzwgflrm3rc9r024kb2iiqwasb2b0kmpmsi9bw4z6q"; + }; + + patches = [ + # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff. + ./search-path.patch + ]; + + inherit buildInputs; + C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); + LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); + configureFlags = "--enable-shared --with-threads --enable-unicode --with-wctype-functions"; + + preConfigure = '' + # Purity. + for i in /usr /sw /opt /pkg; do + substituteInPlace ./setup.py --replace $i /no-such-path + done + '' + (if readline != null then '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses" + '' else ""); + + setupHook = ./setup-hook.sh; + + postInstall = '' + rm -rf "$out/lib/python${majorVersion}/test" + ''; + + passthru = { + inherit zlibSupport; + sqliteSupport = sqlite != null; + db4Support = db4 != null; + readlineSupport = readline != null; + opensslSupport = openssl != null; + tkSupport = (tk != null) && (tcl != null); + libPrefix = "python${majorVersion}"; + }; + + meta = { + platforms = stdenv.lib.platforms.all; + }; +} // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch]; } else {} ) ) diff --git a/pkgs/development/interpreters/python/3.1/search-path.patch b/pkgs/development/interpreters/python/3.1/search-path.patch new file mode 100644 index 00000000000..2e7b7526c0c --- /dev/null +++ b/pkgs/development/interpreters/python/3.1/search-path.patch @@ -0,0 +1,27 @@ +diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py +*** Python-2.4.4-orig/setup.py 2006-10-08 19:41:25.000000000 +0200 +--- Python-2.4.4/setup.py 2007-05-27 16:04:54.000000000 +0200 +*************** +*** 279,288 **** + # Check for AtheOS which has libraries in non-standard locations + if platform == 'atheos': + lib_dirs += ['/system/libs', '/atheos/autolnk/lib'] +- lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) + inc_dirs += ['/system/include', '/atheos/autolnk/include'] +- inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) + + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) + if platform in ['osf1', 'unixware7', 'openunix8']: + lib_dirs += ['/usr/ccs/lib'] +--- 279,289 ---- + # Check for AtheOS which has libraries in non-standard locations + if platform == 'atheos': + lib_dirs += ['/system/libs', '/atheos/autolnk/lib'] + inc_dirs += ['/system/include', '/atheos/autolnk/include'] + ++ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) ++ inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) ++ + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) + if platform in ['osf1', 'unixware7', 'openunix8']: + lib_dirs += ['/usr/ccs/lib'] diff --git a/pkgs/development/interpreters/python/3.1/setup-hook.sh b/pkgs/development/interpreters/python/3.1/setup-hook.sh new file mode 100644 index 00000000000..290525c3571 --- /dev/null +++ b/pkgs/development/interpreters/python/3.1/setup-hook.sh @@ -0,0 +1,15 @@ +addPythonPath() { + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.6/site-packages +} + +toPythonPath() { + local paths="$1" + local result= + for i in $paths; do + p="$i/lib/python2.6/site-packages" + result="${result}${result:+:}$p" + done + echo $result +} + +envHooks=(${envHooks[@]} addPythonPath) diff --git a/pkgs/development/python-modules/zope/default.nix b/pkgs/development/python-modules/zope/default.nix deleted file mode 100644 index 3dc5da98e76..00000000000 --- a/pkgs/development/python-modules/zope/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, python}: - -stdenv.mkDerivation rec { - version = "3.2.1"; - name = "zope-${version}"; - src = fetchurl { - url = "http://www.zope.org/Products/Zope3/${version}/Zope-${version}.tgz"; - sha256 = "8431984af75054e4ddfe45bf708924240f8b6b02220cd84d090138413ac82341"; - }; - patches = [ - ./zope_python-2.4.4.patch - ./zope_python-readline.patch - ]; - buildInputs = [python]; -} diff --git a/pkgs/development/python-modules/4suite/default.nix b/pkgs/development/python2-packages/4suite/default.nix similarity index 100% rename from pkgs/development/python-modules/4suite/default.nix rename to pkgs/development/python2-packages/4suite/default.nix diff --git a/pkgs/development/python2-packages/ZopeInterface/default.nix b/pkgs/development/python2-packages/ZopeInterface/default.nix new file mode 100644 index 00000000000..6bcedcd0f17 --- /dev/null +++ b/pkgs/development/python2-packages/ZopeInterface/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, python}: + +stdenv.mkDerivation { + name = "ZopeInterface-3.3.0"; + src = fetchurl { + url = http://www.zope.org/Products/ZopeInterface/3.3.0/zope.interface-3.3.0.tar.gz; + sha256 = "0xahg9cmagn4j3dbifvgzbjliw2jdrbf27fhqwkdp8j80xpyyjf0"; + }; + buildInputs = [python]; + buildPhase = "true"; + installPhase = "python ./setup.py install --prefix=$out"; +} diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python2-packages/bsddb3/default.nix similarity index 100% rename from pkgs/development/python-modules/bsddb3/default.nix rename to pkgs/development/python2-packages/bsddb3/default.nix diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python2-packages/dbus/default.nix similarity index 100% rename from pkgs/development/python-modules/dbus/default.nix rename to pkgs/development/python2-packages/dbus/default.nix diff --git a/pkgs/development/python2-packages/default.nix b/pkgs/development/python2-packages/default.nix new file mode 100644 index 00000000000..0014e92f8cf --- /dev/null +++ b/pkgs/development/python2-packages/default.nix @@ -0,0 +1,876 @@ +{ pkgs, python, makeWrapper }: + +let inherit (pkgs) builderDefsPackage lib fetchurl fetchsvn stdenv zlib libjpeg; + +in + +rec { + + # pythonPackages + # only keep packages being known to build with this python version + b = builtins.removeAttrs allPythonPackages + (["foolscap" + "nevow" + "setuptoolsTrial" + "simplejson" + ] + # these packages don't build with specific python versions.. + ++ (pkgs.lib.optionals (python.libPrefix == "python2.6") []) + ++ (pkgs.lib.optionals (python.libPrefix == "python2.5") + ["pycairo" "pygtk" "pyGtkGlade" "rhpl" "pygobject" "pythonSexy"]) + ); + + result = b // { + all = builtins.removeAttrs b ["buildPythonPackage"]; + }; + + # intentionally not using rec. Using b so that if a depedency doesn't build + # its less work to find all depending packages + allPythonPackages = { + + setuptools = builderDefsPackage (import ./setuptools) { + inherit python; + inherit (pkgs) makeWrapper; + }; + + buildPythonPackage = + import ./generic { + inherit python makeWrapper lib; + inherit (b) setuptools; + }; + + foursuite = import ./4suite { + inherit fetchurl stdenv python; + }; + + bsddb3 = import ./bsddb3 { + inherit fetchurl stdenv python; + inherit (pkgs) db4; + }; + + # python25 only? + flup = builderDefsPackage ./flup { + inherit fetchurl stdenv python; + inherit (b) setuptools; + }; + + numeric = import ./numeric { + inherit fetchurl stdenv python; + }; + + pil = import ./pil { + inherit fetchurl stdenv python; + inherit (pkgs) zlib libjpeg freetype; + }; + + #psyco = import ./psyco { + # inherit fetchurl stdenv python; + #}; + + pycairo = import ./pycairo { + inherit fetchurl stdenv python; + inherit (pkgs) cairo x11 pkgconfig; + }; + + pycrypto = import ./pycrypto { + inherit fetchurl stdenv python; + inherit (pkgs) gmp; + }; + + pycups = import ./pycups { + inherit stdenv fetchurl python; + inherit (pkgs) cups; + }; + + pygame = import ./pygame { + inherit fetchurl stdenv python; + inherit (pkgs) pkgconfig SDL SDL_image + SDL_mixer SDL_ttf numeric; + }; + + pygobject = import ./pygobject { + inherit fetchurl stdenv python; + inherit (pkgs) pkgconfig glib; + }; + + pygtk = import ./pygtk { + inherit fetchurl stdenv python; + inherit (b) pygobject pycairo; + inherit (pkgs) pkgconfig; + inherit (pkgs.gtkLibs) glib gtk; + }; + + pyGtkGlade = import ./pygtk { + inherit fetchurl stdenv python; + inherit (b) pygobject pycairo; + inherit (pkgs) pkgconfig; + inherit (pkgs.gtkLibs) glib gtk; + inherit (pkgs.gnome) libglade; + }; + + pyopengl = import ./pyopengl { + inherit fetchurl stdenv python; + inherit (b) setuptools; + inherit (pkgs) mesa freeglut pil; + }; + + pyopenssl = builderDefsPackage (import ./pyopenssl) { + inherit python; + inherit (pkgs) openssl; + }; + + pystringtemplate = import ./stringtemplate { + inherit stdenv fetchurl python; + inherit (pkgs) antlr; + }; + + pythonDBus = builderDefsPackage (import ./dbus) { + inherit python; + inherit (pkgs) pkgconfig dbus_glib; + dbus = pkgs.dbus.libs; + }; + + pythonIRClib = builderDefsPackage (import ./irclib) { + inherit python; + }; + + pythonSexy = builderDefsPackage (import ./libsexy) { + inherit python; + inherit (pkgs) pkgconfig libxml2 pygtk libsexy; + inherit (pkgs.gtkLibs) pango gtk glib; + }; + + rhpl = import ./rhpl { + inherit stdenv fetchurl python; + inherit (pkgs) rpm cpio wirelesstools gettext; + }; + + sip = b.sip48; + sip48 = import ./python-sip { + inherit stdenv fetchurl python; + }; + + sip410 = import ./python-sip/4.10.nix { + inherit stdenv fetchurl python; + }; + + pyqt4 = b.pyqt45; + + pyqt45 = import ./pyqt/4.5.nix { + inherit stdenv fetchurl python; + inherit (b) sip; + qt4 = pkgs.qt45; + }; + + pyqt47 = import ./pyqt/4.7.nix { + inherit stdenv fetchurl python; + qt4 = pkgs.qt46; + sip = b.sip410; + }; + + pyx = import ./pyx { + inherit fetchurl stdenv python makeWrapper; + }; + + pyxml = import ./pyxml { + inherit fetchurl stdenv python makeWrapper; + }; + + wxPython = b.wxPython26; + + wxPython26 = import ./wxPython/2.6.nix { + inherit fetchurl stdenv python; + inherit (pkgs) pkgconfig; + wxGTK = pkgs.wxGTK26; + }; + + wxPython28 = import ./wxPython/2.8.nix { + inherit fetchurl stdenv python; + inherit (pkgs) pkgconfig; + inherit (pkgs) wxGTK; + }; + + ZopeInterface = import ./ZopeInterface { + inherit fetchurl stdenv python; + }; + + argparse = b.buildPythonPackage (rec { + name = "argparse-0.9.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/argparse/${name}.zip"; + sha256 = "00jw32wwccpf9smraywjk869b93w7f99rw8gi63yfhw6379fnq6m"; + }; + + buildInputs = [ pkgs.unzip ]; + + # How do we run the tests? + doCheck = false; + + meta = { + homepage = http://code.google.com/p/argparse/; + + license = "Apache License 2.0"; + + description = "argparse: Python command line parser"; + + longDescription = '' + The argparse module makes writing command line tools in Python + easy. Just briefly describe your command line interface and + argparse will take care of the rest, including: parsing the + arguments and flags from sys.argv, converting arg strings into + objects for your program, formatting and printing any help + messages, and much more. + ''; + }; + }); + + boto = b.buildPythonPackage (rec { + name = "boto-1.9b"; + + src = fetchurl { + url = "http://boto.googlecode.com/files/${name}.tar.gz"; + sha256 = "0kir3ddm79rxdf7wb5czmxpbnqzgj3j966q4mach29kkb98p48wz"; + }; + + meta = { + homepage = http://code.google.com/p/boto/; + + license = "bsd"; + + description = "Python interface to Amazon Web Services"; + + longDescription = '' + The boto module is an integrated interface to current and + future infrastructural services offered by Amazon Web + Services. This includes S3, SQS, EC2, among others. + ''; + }; + }); + + darcsver = b.buildPythonPackage (rec { + name = "darcsver-1.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz"; + sha256 = "1a5cl2yhnd88a4vkc9r381cbjkcvga87dp9zx5av68857q1nvvvq"; + }; + + buildInputs = [ pkgs.darcs ]; + + meta = { + description = "Darcsver, generate a version number from Darcs history"; + + homepage = http://pypi.python.org/pypi/darcsver; + + license = "BSD-style"; + }; + }); + + dateutil = b.buildPythonPackage (rec { + name = "dateutil-1.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz"; + sha256 = "0mrkh932k8s74h4rpgksvpmwbrrkq8zn78gbgwc22i2vlp31bdkl"; + }; + + meta = { + description = "Powerful extensions to the standard datetime module"; + + homepage = http://pypi.python.org/pypi/python-dateutil; + + license = "BSD-style"; + }; + }); + + foolscap = b.buildPythonPackage (rec { + name = "foolscap-0.4.2"; + + src = fetchurl { + url = "http://foolscap.lothar.com/releases/${name}.tar.gz"; + sha256 = "14g89kjxxci3ssl9jgvpkyrcq62g361aw8pamlkclk8nnrh4f776"; + }; + + propagatedBuildInputs = [ b.twisted pkgs.pyopenssl ]; + + # For some reason "python setup.py test" doesn't work with Python 2.6. + doCheck = false; + + meta = { + homepage = http://foolscap.lothar.com/; + + description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model"; + + longDescription = '' + "Foolscap" is the name for the next-generation RPC protocol, + intended to replace Perspective Broker (part of Twisted). + Foolscap is a protocol to implement a distributed + object-capabilities model in Python. + ''; + + # See http://foolscap.lothar.com/trac/browser/LICENSE. + license = "MIT"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = python.meta.platforms; + }; + }); + + genshi = b.buildPythonPackage { + name = "genshi-0.5.1"; + + src = fetchurl { + url = http://ftp.edgewall.com/pub/genshi/Genshi-0.5.1.tar.bz2; + sha256 = "1g2xw3zvgz59ilv7mrdlnvfl6ph8lwflwd4jr6zwrca2zhj7d8rs"; + }; + + patches = + [ # Fix `make check' (http://bugs.gentoo.org/276299) + (fetchurl { + url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/dev-python/genshi/files/genshi-0.5.1_test_fix.patch?rev=1.1"; + sha256 = "019skkas07lc2kjy5br5jhhf9dqfy4fs389m5f4ws3fc62fklwhk"; + }) + ]; + + buildInputs = [ b.setuptools ]; + + meta = { + description = "Python components for parsing HTML, XML and other textual content"; + + longDescription = '' + Python library that provides an integrated set of + components for parsing, generating, and processing HTML, XML or other + textual content for output generation on the web. + ''; + + license = "BSD"; + }; + }; + + jinja2 = b.buildPythonPackage { + name = "jinja2-2.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.2.1.tar.gz"; + md5 = "fea849d68891218eb0b21c170f1c32d5"; + }; + + meta = { + homepage = http://jinja.pocoo.org/; + description = "Stand-alone template engine"; + license = "BSD"; + longDescription = '' + Jinja2 is a template engine written in pure Python. It provides a + Django inspired non-XML syntax but supports inline expressions and + an optional sandboxed environment. + ''; + }; + }; + + lxml = b.buildPythonPackage ( rec { + name = "lxml-2.2.2"; + + src = fetchurl { + url = http://pypi.python.org/packages/source/l/lxml/lxml-2.2.2.tar.gz; + sha256 = "0zjpsy67wcs69qhb06ficl3a5z229hmczpr8h84rkk05vaagj8qv"; + }; + + buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; + + meta = { + description = "Pythonic binding for the libxml2 and libxslt libraries"; + homepage = http://codespeak.net/lxml/index.html; + license = "BSD"; + }; + }); + + matplotlib = b.buildPythonPackage ( rec { + name = "matplotlib-0.99.1.2"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/matplotlib/${name}.tar.gz"; + sha256 = "12lhwgkahck795946hb8wp605c912zq9ds8067ybbifqs56q24b9"; + }; + + doCheck = false; + + buildInputs = [ b.dateutil b.numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ]; + + meta = { + description = "python plotting library, making publication quality plots"; + homepage = "http://matplotlib.sourceforge.net/"; + }; + }); + + mechanize = b.buildPythonPackage (rec { + name = "mechanize-0.1.11"; + + src = fetchurl { + url = "http://wwwsearch.sourceforge.net/mechanize/src/${name}.tar.gz"; + sha256 = "1h62mwy4iz09jqz17nrb9j8y0djd500zdfqwrz9xmdwqzqwixkj2"; + }; + + meta = { + description = "Stateful programmatic web browsing in Python"; + + homepage = http://wwwsearch.sourceforge.net/; + + license = "BSD-style"; + }; + }); + + namebench = b.buildPythonPackage (rec { + name = "namebench-1.0.5"; + + src = fetchurl { + url = "http://namebench.googlecode.com/files/${name}.tgz"; + sha256 = "6cbde35ce94d1f31e7d48f5d8eec13238b4dbc505675a33f1e183e600c1482c3"; + }; + + # No support of GUI yet. + + doCheck = false; + + meta = { + homepage = http://namebench.googlecode.com/; + description = "Find fastest DNS servers available"; + license = [ + "Apache-2.0" + # third-party program licenses (embedded in the sources) + "LGPL" # Crystal_Clear + "free" # dns + "Apache-2.0" # graphy + "BSD" # jinja2 + ]; + longDescription = '' + It hunts down the fastest DNS servers available for your computer to + use. namebench runs a fair and thorough benchmark using your web + browser history, tcpdump output, or standardized datasets in order + to provide an individualized recommendation. namebench is completely + free and does not modify your system in any way. + ''; + }; + }); + + nevow = b.buildPythonPackage (rec { + name = "nevow-0.9.33"; + + src = fetchurl { + url = "http://divmod.org/trac/attachment/wiki/SoftwareReleases/Nevow-0.9.33.tar.gz?format=raw"; + sha256 = "1b6zhfxx247b60n1qi2hrawhiaah88v8igg37pf7rjkmvy2z1c6c"; + name = "${name}.tar.gz"; + }; + + propagatedBuildInputs = [ b.twisted ]; + + postInstall = "twistd --help > /dev/null"; + + meta = { + description = "Nevow, a web application construction kit for Python"; + + longDescription = '' + Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow + is a web application construction kit written in Python. It is + designed to allow the programmer to express as much of the view + logic as desired in Python, and includes a pure Python XML + expression syntax named stan to facilitate this. However it + also provides rich support for designer-edited templates, using + a very small XML attribute language to provide bi-directional + template manipulation capability. + + Nevow also includes formless, a declarative syntax for + specifying the types of method parameters and exposing these + methods to the web. Forms can be rendered automatically, and + form posts will be validated and input coerced, rendering error + pages if appropriate. Once a form post has validated + successfully, the method will be called with the coerced values. + ''; + + homepage = http://divmod.org/trac/wiki/DivmodNevow; + + license = "BSD-style"; + }; + }); + + numpy = b.buildPythonPackage ( rec { + name = "numpy-1.3.0"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/numpy/${name}.tar.gz"; + sha256 = "7524687cce85aa78103046db5e617c626b0ef871a203a049159f88f35647c90d"; + }; + + doCheck = false; + + buildInputs = [ pkgs.liblapack pkgs.blas /* pkgs.gfortran */ ]; + + # The build should be run as follows: + # + # python setup.py config_fc --fcompiler=gnu95 build + # python setup.py config_fc --fcompiler=gnu95 install + # + # But I con't figure out how to pass the extra flags to setuptools. + + meta = { + description = "Scientific tools for Python"; + homepage = "http://numpy.scipy.org/"; + }; + }); + + ply = b.buildPythonPackage (rec { + name = "ply-3.2"; + + src = fetchurl { + url = "http://www.dabeaz.com/ply/${name}.tar.gz"; + sha256 = "10z4xq8lc8c21v4g7z3zpnvpqbc0vidigrck1kqhwgkqi4gh0kfj"; + }; + + meta = { + homepage = http://www.dabeaz.com/ply/; + + description = "PLY (Python Lex-Yacc), an implementation of the lex and yacc parsing tools for Python"; + + longDescription = '' + PLY is an implementation of lex and yacc parsing tools for Python. + In a nutshell, PLY is nothing more than a straightforward lex/yacc + implementation. Here is a list of its essential features: It's + implemented entirely in Python; It uses LR-parsing which is + reasonably efficient and well suited for larger grammars; PLY + provides most of the standard lex/yacc features including support for + empty productions, precedence rules, error recovery, and support for + ambiguous grammars; PLY is straightforward to use and provides very + extensive error checking; PLY doesn't try to do anything more or less + than provide the basic lex/yacc functionality. In other words, it's + not a large parsing framework or a component of some larger system. + ''; + + license = "revised-BSD"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = python.meta.platforms; + }; + }); + + psycopg2 = b.buildPythonPackage rec { + name = "psycopg2-2.0.13"; + + doCheck = false; + + src = fetchurl { + url = "http://initd.org/pub/software/psycopg/PSYCOPG-2-0/${name}.tar.gz"; + sha256 = "0arkaa1nbbd3pyn4l1bc75wi7nff3vxxh4s8sj5al5hv20p64pm1"; + }; + + propagatedBuildInputs = [ pkgs.postgresql ]; + + meta = { + description = "PostgreSQL database adapter for the Python programming language"; + license = "GPLv2/ZPL"; + }; + }; + + pycryptopp = b.buildPythonPackage (rec { + name = "pycryptopp-0.5.15"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz"; + sha256 = "0f8v3cs8vjpj423yx3ikj7qjvljrm86x0qpkckidv69kah8kndxa"; + }; + + # Use our own copy of Crypto++. + preConfigure = "export PYCRYPTOPP_DISABLE_EMBEDDED_CRYPTOPP=1"; + + buildInputs = [ b.setuptoolsDarcs b.darcsver pkgs.cryptopp ]; + + meta = { + homepage = http://allmydata.org/trac/pycryptopp; + + description = "Python wrappers for the Crypto++ library"; + + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.linux; + }; + }); + + pysqlite = b.buildPythonPackage (rec { + name = "pysqlite-2.5.5"; + + src = fetchurl { + url = "http://pysqlite.googlecode.com/files/${name}.tar.gz"; + sha256 = "ef7ca7f44893790e1a7084b10ea083770e138689406fddc7076d12d6bff4d44f"; + }; + + # Since the `.egg' file is zipped, the `NEEDED' of the `.so' files + # it contains is not taken into account. Thus, we must explicitly make + # it a propagated input. + propagatedBuildInputs = [ pkgs.sqlite ]; + + patchPhase = '' + substituteInPlace "setup.cfg" \ + --replace "/usr/local/include" "${pkgs.sqlite}/include" \ + --replace "/usr/local/lib" "${pkgs.sqlite}/lib" + ''; + + # FIXME: How do we run the tests? + doCheck = false; + + meta = { + homepage = http://pysqlite.org/; + + description = "Python bindings for the SQLite embedded relational database engine"; + + longDescription = '' + pysqlite is a DB-API 2.0-compliant database interface for SQLite. + + SQLite is a relational database management system contained in + a relatively small C library. It is a public domain project + created by D. Richard Hipp. Unlike the usual client-server + paradigm, the SQLite engine is not a standalone process with + which the program communicates, but is linked in and thus + becomes an integral part of the program. The library + implements most of SQL-92 standard, including transactions, + triggers and most of complex queries. + + pysqlite makes this powerful embedded SQL engine available to + Python programmers. It stays compatible with the Python + database API specification 2.0 as much as possible, but also + exposes most of SQLite's native API, so that it is for example + possible to create user-defined SQL functions and aggregates + in Python. + ''; + + license = "revised BSD"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = python.meta.platforms; + }; + }); + + pyutil = b.buildPythonPackage (rec { + name = "pyutil-1.3.30"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyutil/${name}.tar.gz"; + sha256 = "1ksb4gn8x53wcyddmjv1ma8cvvhjlmfxc6kpszyhb838i7xzla19"; + }; + + buildInputs = [ b.setuptoolsDarcs ]; + propagatedBuildInputs = [ b.zbase32 b.argparse ]; + + meta = { + description = "Pyutil, a collection of mature utilities for Python programmers"; + + longDescription = '' + These are a few data structures, classes and functions which + we've needed over many years of Python programming and which + seem to be of general use to other Python programmers. Many of + the modules that have existed in pyutil over the years have + subsequently been obsoleted by new features added to the + Python language or its standard library, thus showing that + we're not alone in wanting tools like these. + ''; + + homepage = http://allmydata.org/trac/pyutil; + + license = "GPLv2+"; + }; + }); + + pyyaml = b.buildPythonPackage (rec { + name = "PyYAML-3.09"; + + src = fetchurl { + url = "http://pyyaml.org/download/pyyaml/PyYAML-3.09.zip"; + sha256 = "204aca8b42dbe90e460794d743dd16182011da85507bfd4f092f9f76e0688040"; + }; + + buildInputs = [ pkgs.unzip pkgs.pyrex ]; + propagatedBuildInputs = [ pkgs.libyaml ]; + + meta = { + description = "The next generation YAML parser and emitter for Python"; + homepage = http://pyyaml.org; + license = "free"; # !? + }; + }); + + setuptoolsDarcs = b.buildPythonPackage { + name = "setuptools-darcs-1.2.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/setuptools_darcs/setuptools_darcs-1.2.8.tar.gz"; + sha256 = "0jg9q9mhsky444mm7lpmmlxai8hmjg4pc71viv4kni8gls0gk9n8"; + }; + + propagatedBuildInputs = [ pkgs.darcs ]; + + meta = { + description = "setuptools plugin for the Darcs version control system"; + + homepage = http://allmydata.org/trac/setuptools_darcs; + + license = "BSD"; + }; + }; + + setuptoolsTrial = b.b.buildPythonPackage { + name = "setuptools-trial-0.5.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/setuptools_trial/setuptools_trial-0.5.3.tar.gz"; + sha256 = "0h3mgjsz3z1sjl9j0b6bv4bss8d0przamj4gnjmpyazc633hhlyi"; + }; + + propagatedBuildInputs = [ b.twisted ]; + + meta = { + description = "setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)"; + + homepage = http://allmydata.org/trac/setuptools_trial; + + license = "unspecified"; # ! + }; + }; + + simplejson = b.b.buildPythonPackage (rec { + name = "simplejson-2.0.9"; + + src = fetchsvn { + url = "http://simplejson.googlecode.com/svn/tags/${name}"; + sha256 = "a48d5256fdb4f258c33da3dda110ecf3c786f086dcb08a01309acde6d1ddb921"; + rev = "172"; # to be on the safe side + }; + + meta = { + description = "simplejson is a simple, fast, extensible JSON encoder/decoder for Python"; + + longDescription = '' + simplejson is compatible with Python 2.4 and later with no + external dependencies. It covers the full JSON specification + for both encoding and decoding, with unicode support. By + default, encoding is done in an encoding neutral fashion (plain + ASCII with \uXXXX escapes for unicode characters). + ''; + + homepage = http://code.google.com/p/simplejson/; + + license = "MIT"; + }; + }); + + trac = b.buildPythonPackage { + name = "trac-0.11.5"; + + src = fetchurl { + url = http://ftp.edgewall.com/pub/trac/Trac-0.11.5.tar.gz; + sha256 = "cc3362ecc533abc1755dd78e2d096d1413bc975abc3185318f4821458cd6a8ac"; + }; + + doCheck = false; + + PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; + + propagatedBuildInputs = [ b.genshi b.setuptools ]; + + meta = { + description = "Enhanced wiki and issue tracking system for software development projects"; + + license = "BSD"; + }; + }; + + twisted = b.buildPythonPackage { + name = "twisted-8.2.0"; + + src = fetchurl { + url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.2/Twisted-8.2.0.tar.bz2; + sha256 = "1c6zplisjdnjzkfs0ld3a0f7m7xbjgx5rcwsdw5i1xiibsq2nq70"; + }; + + propagatedBuildInputs = [ b.ZopeInterface ]; + + # Generate Twisted's plug-in cache. Twited users must do it as well. See + # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 + # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for + # details. + postInstall = "$out/bin/twistd --help > /dev/null"; + + meta = { + homepage = http://twistedmatrix.com/; + + description = "Twisted, an event-driven networking engine written in Python"; + + longDescription = '' + Twisted is an event-driven networking engine written in Python + and licensed under the MIT license. + ''; + + license = "MIT"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = python.meta.platforms; + }; + }; + + zbase32 = b.buildPythonPackage (rec { + name = "zbase32-1.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zbase32/${name}.tar.gz"; + sha256 = "0n59l4rs26vrhxpsfrwybjjir68aj23f09k1yjnbxqy5n0khp8gm"; + }; + + # Tests require `pyutil' so disable them to avoid circular references. + doCheck = false; + + buildInputs = [ b.setuptoolsDarcs ]; + + meta = { + description = "zbase32, a base32 encoder/decoder"; + + homepage = http://pypi.python.org/pypi/zbase32; + + license = "BSD"; + }; + }); + + zfec = b.buildPythonPackage (rec { + name = "zfec-1.4.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zfec/${name}.tar.gz"; + sha256 = "0rgg7nsvbr4f9xmiclzypc39fnivg23kldv5aa8si0bgsxn6mh6w"; + }; + + buildInputs = [ b.setuptoolsDarcs ]; + propagatedBuildInputs = [ b.pyutil b.argparse ]; + + meta = { + homepage = http://allmydata.org/trac/zfec; + + description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; + + longDescription = '' + Fast, portable, programmable erasure coding a.k.a. "forward + error correction": the generation of redundant blocks of + information such that if some blocks are lost then the + original data can be recovered from the remaining blocks. The + zfec package includes command-line tools, C API, Python API, + and Haskell API. + ''; + + license = "GPLv2+"; + }; + }); + + xmpppy = builderDefsPackage (import ./xmpppy) { + inherit python; + inherit (b) setuptools; + }; + + }; + +}.result diff --git a/pkgs/development/python-modules/flup/default.nix b/pkgs/development/python2-packages/flup/default.nix similarity index 100% rename from pkgs/development/python-modules/flup/default.nix rename to pkgs/development/python2-packages/flup/default.nix diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python2-packages/generic/default.nix similarity index 100% rename from pkgs/development/python-modules/generic/default.nix rename to pkgs/development/python2-packages/generic/default.nix diff --git a/pkgs/development/python-modules/irclib/default.nix b/pkgs/development/python2-packages/irclib/default.nix similarity index 100% rename from pkgs/development/python-modules/irclib/default.nix rename to pkgs/development/python2-packages/irclib/default.nix diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python2-packages/libsexy/default.nix similarity index 100% rename from pkgs/development/python-modules/libsexy/default.nix rename to pkgs/development/python2-packages/libsexy/default.nix diff --git a/pkgs/development/python-modules/numeric/default.nix b/pkgs/development/python2-packages/numeric/default.nix similarity index 100% rename from pkgs/development/python-modules/numeric/default.nix rename to pkgs/development/python2-packages/numeric/default.nix diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python2-packages/pil/default.nix similarity index 100% rename from pkgs/development/python-modules/pil/default.nix rename to pkgs/development/python2-packages/pil/default.nix diff --git a/pkgs/development/python-modules/psyco/default.nix b/pkgs/development/python2-packages/psyco/default.nix similarity index 100% rename from pkgs/development/python-modules/psyco/default.nix rename to pkgs/development/python2-packages/psyco/default.nix diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python2-packages/pycairo/default.nix similarity index 100% rename from pkgs/development/python-modules/pycairo/default.nix rename to pkgs/development/python2-packages/pycairo/default.nix diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python2-packages/pycrypto/default.nix similarity index 100% rename from pkgs/development/python-modules/pycrypto/default.nix rename to pkgs/development/python2-packages/pycrypto/default.nix diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python2-packages/pycups/default.nix similarity index 100% rename from pkgs/development/python-modules/pycups/default.nix rename to pkgs/development/python2-packages/pycups/default.nix diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python2-packages/pygame/default.nix similarity index 100% rename from pkgs/development/python-modules/pygame/default.nix rename to pkgs/development/python2-packages/pygame/default.nix diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python2-packages/pygobject/default.nix similarity index 100% rename from pkgs/development/python-modules/pygobject/default.nix rename to pkgs/development/python2-packages/pygobject/default.nix diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python2-packages/pygtk/default.nix similarity index 100% rename from pkgs/development/python-modules/pygtk/default.nix rename to pkgs/development/python2-packages/pygtk/default.nix diff --git a/pkgs/development/python2-packages/pyopengl/default.nix b/pkgs/development/python2-packages/pyopengl/default.nix new file mode 100644 index 00000000000..6a8008d2525 --- /dev/null +++ b/pkgs/development/python2-packages/pyopengl/default.nix @@ -0,0 +1,38 @@ +{ fetchurl, stdenv, python, setuptools, mesa, freeglut, pil }: + +let version = "3.0.0b5"; +in + stdenv.mkDerivation { + name = "pyopengl-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/pyopengl/PyOpenGL-${version}.tar.gz"; + sha256 = "1rjpl2qdcqn4wamkik840mywdycd39q8dn3wqfaiv35jdsbifxx3"; + }; + + # Note: We need `ctypes', available in Python 2.5+. + buildInputs = [ python ]; + propagatedBuildInputs = [ setuptools mesa freeglut pil ]; + + configurePhase = "ensureDir $out/lib/python2.5/site-packages"; + buildPhase = "python setup.py build"; + + installPhase = '' + PYTHONPATH="$out/lib/python2.5/site-packages:$PYTHONPATH" \ + python setup.py install --prefix=$out + ''; + + meta = { + homepage = http://pyopengl.sourceforge.net/; + description = "PyOpenGL, the Python OpenGL bindings"; + + longDescription = '' + PyOpenGL is the cross platform Python binding to OpenGL and + related APIs. The binding is created using the standard (in + Python 2.5) ctypes library, and is provided under an extremely + liberal BSD-style Open-Source license. + ''; + + license = "BSD-style"; + }; + } diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python2-packages/pyopenssl/default.nix similarity index 100% rename from pkgs/development/python-modules/pyopenssl/default.nix rename to pkgs/development/python2-packages/pyopenssl/default.nix diff --git a/pkgs/development/python2-packages/pyqt/4.5.nix b/pkgs/development/python2-packages/pyqt/4.5.nix new file mode 100644 index 00000000000..4357a4c0ed0 --- /dev/null +++ b/pkgs/development/python2-packages/pyqt/4.5.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, python, sip, qt4}: + +stdenv.mkDerivation { + name = "pyqt-x11-gpl-4.5.4"; + + src = fetchurl { + url = http://pyqwt.sourceforge.net/support/PyQt-x11-gpl-4.5.4.tar.gz; # Not downloading from riverbank, since they remove older releases + sha256 = "1a55zng6yhnbk5swc02bkbyccdgf0f0v94yxk9v5a43hv9xnrl5k"; + }; + + configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins"; + + buildInputs = [ python sip qt4 ]; + + meta = { + description = "Python bindings for Qt"; + license = "GPL"; + homepage = http://www.riverbankcomputing.co.uk; + maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.mesaPlatforms; + }; +} diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python2-packages/pyqt/4.7.nix similarity index 100% rename from pkgs/development/python-modules/pyqt/default.nix rename to pkgs/development/python2-packages/pyqt/4.7.nix diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python2-packages/python-sip/4.10.nix similarity index 100% rename from pkgs/development/python-modules/python-sip/default.nix rename to pkgs/development/python2-packages/python-sip/4.10.nix diff --git a/pkgs/development/python2-packages/python-sip/default.nix b/pkgs/development/python2-packages/python-sip/default.nix new file mode 100644 index 00000000000..3fb827e4600 --- /dev/null +++ b/pkgs/development/python2-packages/python-sip/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation { + name = "sip-4.8.2"; + + src = fetchurl { + url = http://pyqwt.sourceforge.net/support/sip-4.8.2.tar.gz; # Not downloading from riverbank, since they remove older releases + sha256 = "1afr2qaibzgf8fq4fmc31jz9hvbwxbg5jvl68ygvkkdvnbg2kfrf"; + }; + + configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include"; + + buildInputs = [ python ]; + + meta = { + description = "Creates C++ bindings for Python modules"; + license = "GPL"; + maintainers = [ stdenv.lib.maintainers.sander ]; + }; +} diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python2-packages/pyx/default.nix similarity index 100% rename from pkgs/development/python-modules/pyx/default.nix rename to pkgs/development/python2-packages/pyx/default.nix diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python2-packages/pyxml/default.nix similarity index 100% rename from pkgs/development/python-modules/pyxml/default.nix rename to pkgs/development/python2-packages/pyxml/default.nix diff --git a/pkgs/development/python-modules/rhpl/builder.sh b/pkgs/development/python2-packages/rhpl/builder.sh similarity index 100% rename from pkgs/development/python-modules/rhpl/builder.sh rename to pkgs/development/python2-packages/rhpl/builder.sh diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python2-packages/rhpl/default.nix similarity index 100% rename from pkgs/development/python-modules/rhpl/default.nix rename to pkgs/development/python2-packages/rhpl/default.nix diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python2-packages/setuptools/default.nix similarity index 100% rename from pkgs/development/python-modules/setuptools/default.nix rename to pkgs/development/python2-packages/setuptools/default.nix diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python2-packages/stringtemplate/default.nix similarity index 100% rename from pkgs/development/python-modules/stringtemplate/default.nix rename to pkgs/development/python2-packages/stringtemplate/default.nix diff --git a/pkgs/development/python-modules/wxPython/2.6.nix b/pkgs/development/python2-packages/wxPython/2.6.nix similarity index 100% rename from pkgs/development/python-modules/wxPython/2.6.nix rename to pkgs/development/python2-packages/wxPython/2.6.nix diff --git a/pkgs/development/python-modules/wxPython/2.8.nix b/pkgs/development/python2-packages/wxPython/2.8.nix similarity index 100% rename from pkgs/development/python-modules/wxPython/2.8.nix rename to pkgs/development/python2-packages/wxPython/2.8.nix diff --git a/pkgs/development/python-modules/wxPython/builder.sh b/pkgs/development/python2-packages/wxPython/builder.sh similarity index 100% rename from pkgs/development/python-modules/wxPython/builder.sh rename to pkgs/development/python2-packages/wxPython/builder.sh diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python2-packages/xmpppy/default.nix similarity index 100% rename from pkgs/development/python-modules/xmpppy/default.nix rename to pkgs/development/python2-packages/xmpppy/default.nix diff --git a/pkgs/development/python-modules/zope/zope_python-2.4.4.patch b/pkgs/development/python2-packages/zope/zope_python-2.4.4.patch similarity index 100% rename from pkgs/development/python-modules/zope/zope_python-2.4.4.patch rename to pkgs/development/python2-packages/zope/zope_python-2.4.4.patch diff --git a/pkgs/development/python-modules/zope/zope_python-readline.patch b/pkgs/development/python2-packages/zope/zope_python-readline.patch similarity index 100% rename from pkgs/development/python-modules/zope/zope_python-readline.patch rename to pkgs/development/python2-packages/zope/zope_python-readline.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2145a2f282..2b7358b824b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1234,7 +1234,7 @@ let # I did not find any better way of reusing buildPythonPackage+setuptools # for a python with openssl support buildPythonPackage = assert pythonFull.opensslSupport; - import ../development/python-modules/generic { + import ../development/python2-packages/generic { inherit makeWrapper lib; python = pythonFull; setuptools = builderDefsPackage (import ../development/python-modules/setuptools) { @@ -1423,24 +1423,6 @@ let inherit fetchurl stdenv python emacs; }; - pystringtemplate = import ../development/python-modules/stringtemplate { - inherit stdenv fetchurl python antlr; - }; - - pythonDBus = builderDefsPackage (import ../development/python-modules/dbus) { - inherit python pkgconfig dbus_glib; - dbus = dbus.libs; - }; - - pythonIRClib = builderDefsPackage (import ../development/python-modules/irclib) { - inherit python; - }; - - pythonSexy = builderDefsPackage (import ../development/python-modules/libsexy) { - inherit python libsexy pkgconfig libxml2 pygtk; - inherit (gtkLibs) pango gtk glib; - }; - openmpi = import ../development/libraries/openmpi { inherit fetchurl stdenv; }; @@ -1862,10 +1844,6 @@ let inherit fetchurl perl perlPackages; }; - xmpppy = builderDefsPackage (import ../development/python-modules/xmpppy) { - inherit python setuptools; - }; - xpf = import ../tools/text/xml/xpf { inherit fetchurl stdenv python; libxml2 = libxml2Python; @@ -2664,16 +2642,6 @@ let inherit stdenv fetchurl; }; - python = if getConfig ["python" "full"] false then pythonFull else pythonBase; - python25 = if getConfig ["python" "full"] false then python25Full else python25Base; - python26 = if getConfig ["python" "full"] false then python26Full else python26Base; - pythonBase = python26Base; - pythonFull = python26Full; - - python24 = import ../development/interpreters/python/2.4 { - inherit fetchurl stdenv zlib bzip2; - }; - python25Base = composedArgsAndFun (import ../development/interpreters/python/2.5) { inherit fetchurl stdenv zlib bzip2 gdbm; }; @@ -2708,6 +2676,19 @@ let xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null; }; + + python31Base = composedArgsAndFun (import ../development/interpreters/python/3.1) { + inherit fetchurl stdenv zlib bzip2 gdbm; + arch = if stdenv.isDarwin then darwinArchUtility else null; + sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null; + }; + + python = if getConfig ["python" "full"] false then pythonFull else pythonBase; + python25 = if getConfig ["python" "full"] false then python25Full else python25Base; + python26 = if getConfig ["python" "full"] false then python26Full else python26Base; + pythonBase = python26Base; + pythonFull = python26Full; + # new python and lib proposal # - adding a python lib to buildinputs should be enough # (handles .pth files by patching site.py @@ -5291,142 +5272,47 @@ let ### DEVELOPMENT / PYTHON MODULES - buildPythonPackage = - import ../development/python-modules/generic { - inherit python setuptools makeWrapper lib; - }; + python25Packages = recurseIntoAttrs( import ../development/python2-packages { + inherit pkgs makeWrapper; + python = python25; + }); - buildPython26Package = - import ../development/python-modules/generic { - inherit makeWrapper lib; - python = python26; - setuptools = setuptools_python26; - }; + python26Packages = recurseIntoAttrs( import ../development/python2-packages { + inherit pkgs makeWrapper; + python = python26; + }); pythonPackages = python26Packages; + buildPythonPackage = pythonPackages.buildPythonPackage; - python25Packages = recurseIntoAttrs (import ./python-packages.nix { - inherit pkgs python buildPythonPackage; - }); - - python26Packages = recurseIntoAttrs (import ./python-packages.nix { - inherit pkgs; - python = python26; - buildPythonPackage = buildPython26Package; - }); - - foursuite = import ../development/python-modules/4suite { - inherit fetchurl stdenv python; - }; - - bsddb3 = import ../development/python-modules/bsddb3 { - inherit fetchurl stdenv python db4; - }; - - flup = builderDefsPackage ../development/python-modules/flup { - inherit fetchurl stdenv; - python = python25; - setuptools = setuptools.passthru.function {python = python25;}; - }; - - numeric = import ../development/python-modules/numeric { - inherit fetchurl stdenv python; - }; - - pil = import ../development/python-modules/pil { - inherit fetchurl stdenv python zlib libjpeg freetype; - }; - - psyco = import ../development/python-modules/psyco { - inherit fetchurl stdenv python; - }; - - pycairo = import ../development/python-modules/pycairo { - inherit fetchurl stdenv python pkgconfig cairo x11; - }; - - pycrypto = import ../development/python-modules/pycrypto { - inherit fetchurl stdenv python gmp; - }; - - pycups = import ../development/python-modules/pycups { - inherit stdenv fetchurl python cups; - }; - - pygame = import ../development/python-modules/pygame { - inherit fetchurl stdenv python pkgconfig SDL SDL_image - SDL_mixer SDL_ttf numeric; - }; - - pygobject = import ../development/python-modules/pygobject { - inherit fetchurl stdenv python pkgconfig glib; - }; - - pygtk = import ../development/python-modules/pygtk { - inherit fetchurl stdenv python pkgconfig pygobject pycairo; - inherit (gtkLibs) glib gtk; - }; - - pyGtkGlade = import ../development/python-modules/pygtk { - inherit fetchurl stdenv python pkgconfig pygobject pycairo; - inherit (gtkLibs) glib gtk; - inherit (gnome) libglade; - }; - - pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) { - inherit python openssl; - }; - - rhpl = import ../development/python-modules/rhpl { - inherit stdenv fetchurl rpm cpio python wirelesstools gettext; - }; - - sip = import ../development/python-modules/python-sip { - inherit stdenv fetchurl python; - }; - - pyqt4 = import ../development/python-modules/pyqt { - inherit stdenv fetchurl python qt4 sip; - }; - - pyx = import ../development/python-modules/pyx { - inherit fetchurl stdenv python makeWrapper; - }; - - pyxml = import ../development/python-modules/pyxml { - inherit fetchurl stdenv python makeWrapper; - }; - - setuptools = builderDefsPackage (import ../development/python-modules/setuptools) { - inherit python makeWrapper; - }; - - setuptools_python26 = builderDefsPackage (import ../development/python-modules/setuptools) { - inherit makeWrapper; - python = python26; - }; - - wxPython = wxPython26; - - wxPython26 = import ../development/python-modules/wxPython/2.6.nix { - inherit fetchurl stdenv pkgconfig python; - wxGTK = wxGTK26; - }; - - wxPython28 = import ../development/python-modules/wxPython/2.8.nix { - inherit fetchurl stdenv pkgconfig python; - inherit wxGTK; - }; - + # global python library aliases: + pycrypto = pythonPackages.pycrypto; twisted = pythonPackages.twisted; + pygtk = pythonPackages.pygtk; + pygobject = pythonPackages.pygobject; + pycairo = pythonPackages.pycairo; + pyGtkGlade = pythonPackages.pyGtkGlade; + pythonDBus = pythonPackages.pythonDBus; + setuptools = pythonPackages.setuptools; + pil = pythonPackages.pil; + pythonIRClib = pythonPackages.pythonIRClib; + pyxml = pythonPackages.pyxml; + pyopengl = pythonPackages.pyopengl; + pygame = pythonPackages.pygame; + flup = pythonPackages.flup; + numeric = pythonPackages.numeric; + pyqt4 = pythonPackages.pyqt4; + sip410 = pythonPackages.sip410; + pyopenssl = pythonPackages.pyopenssl; + pythonSexy = pythonPackages.pythonSexy; + wxPython = wxPython26; + sip = pythonPackages.sip; + xmpppy = pythonPackages.xmpppy; - ZopeInterface = pythonPackages.zopeInterface; - - zope = import ../development/python-modules/zope { - inherit fetchurl stdenv; - python = python24; - }; - + # 2.6 aliases + wxPython26 = python26Packages.wxPython; + pil_python26 = python26Packages.pil; + ### SERVERS From f18af16dfe4ed57af52303a2e28427fd6541b12e Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 18 Apr 2010 10:53:31 +0000 Subject: [PATCH 260/313] update to 2.8.4 svn path=/nixpkgs/trunk/; revision=21143 --- pkgs/applications/office/abiword/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 9c5a0506287..264bf657cd6 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -3,10 +3,10 @@ enchant, wv, librsvg, bzip2 }: stdenv.mkDerivation { - name = "abiword-2.8.3"; + name = "abiword-2.8.4"; src = fetchurl { - url = http://www.abisource.org/downloads/abiword/2.8.3/source/abiword-2.8.3.tar.gz; - sha256 = "1jz3w1rp5wyhv2sk62r14kxljcd3x9kf4axm3zfjaqifhnjpnkxp"; + url = http://www.abisource.org/downloads/abiword/2.8.4/source/abiword-2.8.4.tar.gz; + sha256 = "1v2f83cc8j6chsyzgjh903s6c8fkr7dy5s10bqigzfrqi9iv990l"; }; buildInputs = [pkgconfig gtk libglade librsvg bzip2 From 64249d43725eb967e9f8ca8fc614c416c3e490cb Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sun, 18 Apr 2010 18:07:03 +0000 Subject: [PATCH 261/313] libmad: Added patch to install mad.pc, stolen from Arch Linux. svn path=/nixpkgs/trunk/; revision=21144 --- pkgs/development/libraries/libmad/default.nix | 5 +- .../libraries/libmad/pkgconfig.patch | 117 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libmad/pkgconfig.patch diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index aa5c3526e85..83070b92ac6 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, autoconf}: stdenv.mkDerivation { name = "libmad-0.15.1b"; @@ -8,8 +8,11 @@ stdenv.mkDerivation { sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"; }; + patches = [ ./pkgconfig.patch ]; + # The -fforce-mem flag has been removed in GCC 4.3. preConfigure = '' + ${autoconf}/bin/autoconf substituteInPlace configure --replace "-fforce-mem" "" ''; diff --git a/pkgs/development/libraries/libmad/pkgconfig.patch b/pkgs/development/libraries/libmad/pkgconfig.patch new file mode 100644 index 00000000000..0ac88acb841 --- /dev/null +++ b/pkgs/development/libraries/libmad/pkgconfig.patch @@ -0,0 +1,117 @@ +diff -ruN libmad-0.15.1b.orig/Makefile.am libmad-0.15.1b/Makefile.am +--- libmad-0.15.1b.orig/Makefile.am 2004-02-17 02:02:03.000000000 +0000 ++++ libmad-0.15.1b/Makefile.am 2005-08-25 12:08:04.000000000 +0000 +@@ -33,9 +33,12 @@ + minimad_INCLUDES = + minimad_LDADD = libmad.la + +-EXTRA_DIST = mad.h.sed \ ++EXTRA_DIST = mad.h.sed mad.pc.in \ + CHANGES COPYRIGHT CREDITS README TODO VERSION + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA= mad.pc ++ + exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \ + synth.h decoder.h + +diff -ruN libmad-0.15.1b.orig/Makefile.in libmad-0.15.1b/Makefile.in +--- libmad-0.15.1b.orig/Makefile.in 2004-02-17 02:33:23.000000000 +0000 ++++ libmad-0.15.1b/Makefile.in 2005-08-25 12:09:34.000000000 +0000 +@@ -14,6 +14,8 @@ + + @SET_MAKE@ + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = mad.pc + + SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) $(minimad_SOURCES) + +@@ -43,7 +45,7 @@ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/config.h.in $(srcdir)/libmad.list.in \ + $(top_srcdir)/configure COPYING INSTALL TODO config.guess \ +- config.sub depcomp install-sh ltmain.sh missing mkinstalldirs ++ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs mad.pc.in + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac +@@ -53,7 +55,7 @@ + configure.lineno configure.status.lineno + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = libmad.list ++CONFIG_CLEAN_FILES = libmad.list mad.pc + am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) + libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) +@@ -218,7 +220,7 @@ + minimad_SOURCES = minimad.c + minimad_INCLUDES = + minimad_LDADD = libmad.la +-EXTRA_DIST = mad.h.sed \ ++EXTRA_DIST = mad.h.sed mad.pc.in \ + CHANGES COPYRIGHT CREDITS README TODO VERSION + + exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \ +@@ -298,6 +300,28 @@ + rm -f stamp-h1 + touch $@ + ++mad.pc: $(top_builddir)/config.status mad.pc.in ++ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status ++ ++install-pkgconfigDATA: $(pkgconfig_DATA) ++ @$(NORMAL_INSTALL) ++ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) ++ @list='$(pkgconfig_DATA)'; for p in $$list; do \ ++ if test -f $(srcdir)/$$p; then \ ++ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ ++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \ ++ else if test -f $$p; then \ ++ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ ++ $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \ ++ fi; fi; \ ++ done ++ ++uninstall-pkgconfigDATA: ++ @$(NORMAL_UNINSTALL) ++ list='$(pkgconfig_DATA)'; for p in $$list; do \ ++ rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \ ++ done ++ + distclean-hdr: + -rm -f config.h stamp-h1 + libmad.list: $(top_builddir)/config.status $(srcdir)/libmad.list.in +@@ -726,7 +750,7 @@ + + info-am: + +-install-data-am: install-includeHEADERS ++install-data-am: install-includeHEADERS install-pkgconfigDATA + + install-exec-am: install-libLTLIBRARIES + +@@ -757,7 +781,7 @@ + ps-am: + + uninstall-am: uninstall-includeHEADERS uninstall-info-am \ +- uninstall-libLTLIBRARIES ++ uninstall-libLTLIBRARIES install-pkgconfigDATA + + uninstall-info: uninstall-info-recursive + +diff -ruN libmad-0.15.1b.orig/mad.pc.in libmad-0.15.1b/mad.pc.in +--- libmad-0.15.1b.orig/mad.pc.in 1970-01-01 00:00:00.000000000 +0000 ++++ libmad-0.15.1b/mad.pc.in 2005-08-25 12:08:04.000000000 +0000 +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: MAD ++Description: libmad - MPEG audio decoder library ++Version: @VERSION@ ++Libs: -L${libdir} -lmad ++Cflags: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b7358b824b..377a4273189 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4354,7 +4354,7 @@ let }; libmad = import ../development/libraries/libmad { - inherit fetchurl stdenv; + inherit fetchurl stdenv autoconf; }; libmatthew_java = import ../development/libraries/java/libmatthew-java { From eb3b3e043db54462f4f8e31d03d9bb0ff4d013d0 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sun, 18 Apr 2010 18:09:26 +0000 Subject: [PATCH 262/313] libid3tag: Added zlib to propagatedBuildInputs. svn path=/nixpkgs/trunk/; revision=21145 --- pkgs/development/libraries/libid3tag/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index c29d3d29558..e137c939771 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; }; - buildInputs = [zlib]; + propagatedBuildInputs = [zlib]; meta = { description = "An ID3 tag manipulation library."; From 3e40cf1f642b246210c1daa6dbafe7ee5b100051 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sun, 18 Apr 2010 18:57:35 +0000 Subject: [PATCH 263/313] libmikmod: New nixpkg. svn path=/nixpkgs/trunk/; revision=21146 --- .../libraries/libmikmod/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/libmikmod/default.nix diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix new file mode 100644 index 00000000000..3d2a2635fbc --- /dev/null +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, texinfo }: +stdenv.mkDerivation rec { + name = "libmikmod-3.1.12"; + src = fetchurl { + url = "mirror://sourceforge/mikmod/${name}.tar.gz"; + sha256 = "0cpwpl0iqd5zsdwshw69arzlwp883bkmkx41wf3fzrh60dw2n6l9"; + }; + buildInputs = [ texinfo ]; + meta = { + description = "A library for playing tracker music module files"; + longDescription = '' + A library for playing tracker music module files supporting many formats, + including MOD, S3M, IT and XM. + ''; + homepage = http://mikmod.raphnet.net/; + license = "LGPLv2+"; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 377a4273189..d2a06f1efec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4369,6 +4369,10 @@ let inherit fetchurl stdenv curl; }; + libmikmod = import ../development/libraries/libmikmod { + inherit stdenv fetchurl texinfo; + }; + libmilter = import ../development/libraries/libmilter { inherit fetchurl stdenv m4; }; From d5337a70c8d0e53920b36a40f984e7ad3ef96d02 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sun, 18 Apr 2010 19:12:07 +0000 Subject: [PATCH 264/313] libcue: New nixpkg. svn path=/nixpkgs/trunk/; revision=21147 --- pkgs/development/libraries/libcue/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/libcue/default.nix diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix new file mode 100644 index 00000000000..9f5127905c2 --- /dev/null +++ b/pkgs/development/libraries/libcue/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "libcue-1.3.0"; + src = fetchurl { + url = "mirror://sourceforge/libcue/${name}.tar.bz2"; + sha256 = "0gcd9maxh82fc0qah0q8xh74sch0px3n7c0qx0298n2qbk2mkn12"; + }; + meta = { + description = "A library to parse a cue sheet"; + longDescription = '' + libcue is intended to parse a so called cue sheet from a char string or + a file pointer. For handling of the parsed data a convenient API is + available. + ''; + homepage = http://sourceforge.net/projects/libcue/; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2a06f1efec..6218185322c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4173,6 +4173,10 @@ let inherit fetchurl stdenv pkgconfig xlibs mesa glib; }; + libcue = import ../development/libraries/libcue { + inherit stdenv fetchurl; + }; + libcv = builderDefsPackage (import ../development/libraries/libcv) { inherit libtiff libjpeg libpng pkgconfig; inherit (gtkLibs) gtk glib; From 502f97953251dac042f25d309e831d5c5eada9f4 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sun, 18 Apr 2010 19:26:30 +0000 Subject: [PATCH 265/313] mpd: New nixpkg. svn path=/nixpkgs/trunk/; revision=21148 --- pkgs/servers/mpd/default.nix | 44 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/servers/mpd/default.nix diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix new file mode 100644 index 00000000000..10b59417f8f --- /dev/null +++ b/pkgs/servers/mpd/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, pkgconfig, glib, alsaSupport ? true, alsaLib +, flacSupport ? true, flac, vorbisSupport ? true, libvorbis +, madSupport ? true, libmad, id3tagSupport ? true, libid3tag +, mikmodSupport ? true, libmikmod, cueSupport ? true, libcue +}: +let + opt = stdenv.lib.optional; +in +stdenv.mkDerivation rec { + name = "mpd-0.15.9"; + src = fetchurl { + url = "mirror://sourceforge/musicpd/${name}.tar.bz2"; + sha256 = "1fv7ydxs755rsj4pijmsjjpvzlhy5idpvdi6p46nsq3ivjha2msa"; + }; + buildInputs = [ pkgconfig glib ] + ++ opt alsaSupport alsaLib + ++ opt flacSupport flac + ++ opt vorbisSupport libvorbis + ++ opt madSupport libmad + ++ opt id3tagSupport libid3tag + ++ opt mikmodSupport libmikmod + ++ opt cueSupport libcue; + configureFlags = '' + ${if alsaSupport then "--enable-alsa" else "--disable-alsa"} + ${if flacSupport then "--enable-flac" else "--disable-flac"} + ${if vorbisSupport then "--enable-vorbis" else "--disable-vorbis"} + ${if madSupport then "--enable-mad" else "--disable-mad"} + ${if mikmodSupport then "--enable-mikmod" else "--disable-mikmod"} + ${if id3tagSupport then "--enable-id3" else "--disable-id3"} + ${if cueSupport then "--enable-cue" else "--disable-cue"} + ''; + meta = { + description = "A flexible, powerful daemon for playing music"; + longDescription = '' + Music Player Daemon (MPD) is a flexible, powerful daemon for playing + music. Through plugins and libraries it can play a variety of sound + files while being controlled by its network protocol. + ''; + homepage = http://mpd.wikia.com/; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6218185322c..3c52737372c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5401,6 +5401,11 @@ let inherit (pkgsOverriden) fetchurl stdenv apacheHttpd python; }; + mpd = import ../servers/mpd { + inherit stdenv fetchurl pkgconfig glib alsaLib flac libvorbis libmad + libid3tag libmikmod libcue; + }; + myserver = import ../servers/http/myserver { inherit fetchurl stdenv libgcrypt libevent libidn gnutls libxml2 zlib texinfo cppunit xz; From aa0902047ed5435f27ddefbf1f07a3783a60eaae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 18 Apr 2010 21:51:33 +0000 Subject: [PATCH 266/313] LCOV 1.8. svn path=/nixpkgs/trunk/; revision=21149 --- .../tools/analysis/lcov/default.nix | 25 +- .../tools/analysis/lcov/find-source.patch | 229 +++++++----------- 2 files changed, 103 insertions(+), 151 deletions(-) diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index d611f92d051..14f5519c3a8 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "lcov-1.7"; - + name = "lcov-1.8"; + src = fetchurl { url = "mirror://sourceforge/ltp/${name}.tar.gz"; - sha256 = "1cx3haizs0rw6wjsn486qcn50f3qpybflkkb1780cg6s8jzcwdin"; + sha256 = "1xrd9abh1gyki9ln9v772dq7jinvyrvx39s3kxbpiila68mbpa7j"; }; patches = [ ./find-source.patch ]; @@ -19,13 +19,26 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for i in $out/bin/*; do + for i in "$out/bin/"*; do substituteInPlace $i --replace /usr/bin/perl ${perl}/bin/perl done - ''; # */ + ''; meta = { - description = "A code coverage tool for Linux"; + description = "LCOV, a code coverage tool that enhances GNU gcov"; + + longDescription = + '' LCOV is an extension of GCOV, a GNU tool which provides information + about what parts of a program are actually executed (i.e., + "covered") while running a particular test case. The extension + consists of a set of PERL scripts which build on the textual GCOV + output to implement the following enhanced functionality such as + HTML output. + ''; + homepage = http://ltp.sourceforge.net/coverage/lcov.php; + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/development/tools/analysis/lcov/find-source.patch b/pkgs/development/tools/analysis/lcov/find-source.patch index 7e172051064..428ae399d4e 100644 --- a/pkgs/development/tools/analysis/lcov/find-source.patch +++ b/pkgs/development/tools/analysis/lcov/find-source.patch @@ -1,145 +1,84 @@ -diff --exclude '*~' -rc lcov-1.7-orig/bin/geninfo lcov-1.7/bin/geninfo -*** lcov-1.7-orig/bin/geninfo 2008-11-17 14:50:26.000000000 +0100 ---- lcov-1.7/bin/geninfo 2009-09-02 10:55:25.000000000 +0200 -*************** -*** 51,56 **** ---- 51,57 ---- - - use strict; - use File::Basename; -+ use Cwd qw(abs_path); - use Getopt::Long; - use Digest::MD5 qw(md5_base64); - -*************** -*** 81,86 **** ---- 82,88 ---- - sub solve_ambiguous_match($$$); - sub split_filename($); - sub solve_relative_path($$); -+ sub find_source_file($$); - sub get_dir($); - sub read_gcov_header($); - sub read_gcov_file($); -*************** -*** 724,730 **** - - if (defined($source)) - { -! $source = solve_relative_path($base_dir, $source); - } - - # gcov will happily create output even if there's no source code ---- 726,732 ---- - - if (defined($source)) - { -! $source = find_source_file($base_dir, $source); - } - - # gcov will happily create output even if there's no source code -*************** -*** 741,758 **** - die("ERROR: could not read source file $source\n"); - } - -! @matches = match_filename(defined($source) ? $source : -! $gcov_file, keys(%bb_content)); - - # Skip files that are not mentioned in the graph file -! if (!@matches) -! { -! warn("WARNING: cannot find an entry for ".$gcov_file. -! " in $graph_file_extension file, skipping ". -! "file!\n"); -! unlink($gcov_file); -! next; -! } - - # Read in contents of gcov file - @result = read_gcov_file($gcov_file); ---- 743,764 ---- - die("ERROR: could not read source file $source\n"); - } - -! next if ! -r $source; -! -! #@matches = match_filename(defined($source) ? $source : -! # $gcov_file, keys(%bb_content)); - - # Skip files that are not mentioned in the graph file -! #if (!@matches) -! #{ -! # warn("WARNING: cannot find an entry for ".$gcov_file. -! # " in $graph_file_extension file, skipping ". -! # "file!\n"); -! # unlink($gcov_file); -! # next; -! #} -! -! @matches = ($source); - - # Read in contents of gcov file - @result = read_gcov_file($gcov_file); -*************** -*** 949,954 **** ---- 955,979 ---- - } - - -+ sub find_source_file($$) -+ { -+ my ($base_dir, $source) = @_; -+ my $dir = $base_dir; -+ -+ # Hack to make absolute paths work on Nixpkgs coverage -+ # reports. The source is in /nix/store//.build/. -+ $source = $1 if $source =~ /^\/.*\/\.build\/(.*)$/; -+ -+ while (!-e "$dir/$source") { -+ $dir = $dir . "/.."; -+ if (length $dir > 1000) { -+ return "$base_dir/$source"; -+ } -+ } -+ return abs_path("$dir/$source"); -+ } -+ -+ - # - # match_filename(gcov_filename, list) - # -*************** -*** 1478,1484 **** - $function_name =~ s/\W/_/g; - (undef, $filename) = - read_gcno_string(*INPUT, $endianness); -! $filename = solve_relative_path($base_dir, $filename); - - read(INPUT, $packed_word, 4); - $lineno = unpack_int32($packed_word, $endianness); ---- 1503,1509 ---- - $function_name =~ s/\W/_/g; - (undef, $filename) = - read_gcno_string(*INPUT, $endianness); -! $filename = find_source_file($base_dir, $filename); - - read(INPUT, $packed_word, 4); - $lineno = unpack_int32($packed_word, $endianness); -*************** -*** 1530,1536 **** - } - if ($blocks > 1) - { -! $filename = solve_relative_path( - $base_dir, $filename); - if (!defined($result{$filename})) - { ---- 1555,1561 ---- - } - if ($blocks > 1) - { -! $filename = find_source_file( - $base_dir, $filename); - if (!defined($result{$filename})) - { +--- lcov-1.8/bin/geninfo 2010-01-29 11:14:46.000000000 +0100 ++++ lcov-1.8/bin/geninfo 2010-04-18 23:33:43.000000000 +0200 +@@ -51,6 +51,7 @@ + + use strict; + use File::Basename; ++use Cwd qw(abs_path); + use File::Spec::Functions qw /abs2rel catdir file_name_is_absolute splitdir + splitpath rel2abs/; + use Getopt::Long; +@@ -95,6 +96,7 @@ sub match_filename($@); + sub solve_ambiguous_match($$$); + sub split_filename($); + sub solve_relative_path($$); ++sub find_source_file($$); + sub read_gcov_header($); + sub read_gcov_file($); + sub info(@); +@@ -964,7 +966,7 @@ sub process_dafile($$) + + if (defined($source)) + { +- $source = solve_relative_path($base_dir, $source); ++ $source = find_source_file($base_dir, $source); + } + + # gcov will happily create output even if there's no source code +@@ -981,18 +983,9 @@ sub process_dafile($$) + die("ERROR: could not read source file $source\n"); + } + +- @matches = match_filename(defined($source) ? $source : +- $gcov_file, keys(%{$instr})); ++ next if ! -r $source; + +- # Skip files that are not mentioned in the graph file +- if (!@matches) +- { +- warn("WARNING: cannot find an entry for ".$gcov_file. +- " in $graph_file_extension file, skipping ". +- "file!\n"); +- unlink($gcov_file); +- next; +- } ++ @matches = ($source); + + # Read in contents of gcov file + @result = read_gcov_file($gcov_file); +@@ -1242,6 +1235,25 @@ sub solve_relative_path($$) + } + + ++sub find_source_file($$) ++{ ++ my ($base_dir, $source) = @_; ++ my $dir = $base_dir; ++ ++ # Hack to make absolute paths work on Nixpkgs coverage ++ # reports. The source is in /nix/store//.build/. ++ $source = $1 if $source =~ /^\/.*\/\.build\/(.*)$/; ++ ++ while (!-e "$dir/$source") { ++ $dir = $dir . "/.."; ++ if (length $dir > 1000) { ++ return "$base_dir/$source"; ++ } ++ } ++ return abs_path("$dir/$source"); ++} ++ ++ + # + # match_filename(gcov_filename, list) + # +@@ -1918,7 +1930,7 @@ sub process_graphfile($$) + + # Get path to data file in absolute and normalized form (begins with /, + # contains no more ../ or ./) +- $graph_filename = solve_relative_path($cwd, $graph_filename); ++ $graph_filename = find_source_file($cwd, $graph_filename); + + # Get directory and basename of data file + ($graph_dir, $graph_basename) = split_filename($graph_filename); + From b8fc0df586adc68feb3c33d266a50c8311147ec5 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 18 Apr 2010 22:01:50 +0000 Subject: [PATCH 267/313] updating HaXe and Neko svn path=/nixpkgs/trunk/; revision=21150 --- pkgs/development/compilers/haxe/default.nix | 36 ++++++++++----------- pkgs/development/compilers/neko/default.nix | 6 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 72c423cbcd8..4bf6390163e 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -3,44 +3,44 @@ args: with args; let src_haxe_swflib = { - # REGION AUTO UPDATE: { name = "haxe_swflib"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/swflib"; groups = "haxe_group"; } - src= sourceFromHead "haxe_swflib-F_01-25-00.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_swflib-F_01-25-00.tar.gz"; sha256 = "ddea39427de23ff58d3b942bbcce2aac7a25dc11ae06ef983653c82614eba9cd"; }); + # REGION AUTO UPDATE: { name = "haxe_swflib"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/swflib"; groups = "haxe_group"; } + src = sourceFromHead "haxe_swflib-F_23-45-43.tar.gz" + (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_swflib-F_23-45-43.tar.gz"; sha256 = "a77ce2dda48d28f82b48b96f71404edbf7f58e4c3058b425a473c08d260e0816"; }); # END }.src; src_haxe_extc = { - # REGION AUTO UPDATE: { name = "haxe_extc"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extc"; groups = "haxe_group"; } - src= sourceFromHead "haxe_extc-F_01-25-08.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extc-F_01-25-08.tar.gz"; sha256 = "ab2100391735d39c93c72b236ec6e9c5cf09461311a7e3a714d867861926ae37"; }); + # REGION AUTO UPDATE: { name = "haxe_extc"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extc"; groups = "haxe_group"; } + src = sourceFromHead "haxe_extc-F_23-45-44.tar.gz" + (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extc-F_23-45-44.tar.gz"; sha256 = "dd49eb771d52f4d67ca1ebdab1ced9a251dc5799f91896c33bd234690997820f"; }); # END }.src; src_haxe_extlib_dev = { - # REGION AUTO UPDATE: { name = "haxe_extlib_dev"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extlib-dev"; groups = "haxe_group"; } - src= sourceFromHead "haxe_extlib_dev-F_01-25-17.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extlib_dev-F_01-25-17.tar.gz"; sha256 = "01c3c8afdf47a98320e65c0652492508854ea28ead0437abd17a4228b33c8066"; }); + # REGION AUTO UPDATE: { name = "haxe_extlib_dev"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extlib-dev"; groups = "haxe_group"; } + src = sourceFromHead "haxe_extlib_dev-F_23-45-46.tar.gz" + (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extlib_dev-F_23-45-46.tar.gz"; sha256 = "0a3566b6119de9063441cecd553248f3bfc00360edd7143f13b3ab0dbc57b310"; }); # END }.src; src_haxe_xml_light = { - # REGION AUTO UPDATE: { name = "haxe_xml_light"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/xml-light"; groups = "haxe_group"; } - src= sourceFromHead "haxe_xml_light-F_01-25-24.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_xml_light-F_01-25-24.tar.gz"; sha256 = "7fe244681698995af54085bb2ab873d3dd1ff2fac33aa8e7b00fcbbc50249334"; }); + # REGION AUTO UPDATE: { name = "haxe_xml_light"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/xml-light"; groups = "haxe_group"; } + src = sourceFromHead "haxe_xml_light-F_23-45-47.tar.gz" + (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_xml_light-F_23-45-47.tar.gz"; sha256 = "8e1b5a7f1afcb7a6cd8bcac794c3714305ce94a98e989ccf23a38defb6205ed2"; }); # END }.src; src_haxe_neko_include = { - # REGION AUTO UPDATE: { name = "haxe_neko_include"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko/libs/include/ocaml"; groups = "haxe_group"; } - src= sourceFromHead "haxe_neko_include-F_01-25-28.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_neko_include-F_01-25-28.tar.gz"; sha256 = "8b642598889cf2fd1f99dfa037eef09b2511d30a8f5a6a75ee02b2e98fa4c6b7"; }); + # REGION AUTO UPDATE: { name = "haxe_neko_include"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko/libs/include/ocaml"; groups = "haxe_group"; } + src = sourceFromHead "haxe_neko_include-F_23-45-48.tar.gz" + (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_neko_include-F_23-45-48.tar.gz"; sha256 = "78441ec5a20f25c751afeb46e0ea61db6350794f6c5959264059914682c521a9"; }); # END }.src; src_haxe = { - # REGION AUTO UPDATE: { name="haxe"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "haxe"; groups = "haxe_group"; } - src= sourceFromHead "haxe-F_01-25-35.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/haxe-F_01-25-35.tar.gz"; sha256 = "8e5e5330e2fd7ffbbfe48d40bda03256aefbe30cf1be1d9c9065117b2b179f24"; }); + # REGION AUTO UPDATE: { name="haxe-read-only"; type="svn"; url="http://haxe.googlecode.com/svn/trunk"; groups = "haxe_group"; } + src = sourceFromHead "haxe-read-only-3207.tar.gz" + (fetchurl { url = "http://mawercer.de/~nix/repos/haxe-read-only-3207.tar.gz"; sha256 = "2d315ca69fac69674eb562e1349fdebefb0dca4a91eb4ee28371230aaaf60df1"; }); # END }.src; diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 945359e7590..ec47d17ba94 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -14,9 +14,9 @@ composableDerivation {} ( fixed : { name = "neko-cvs"; - # REGION AUTO UPDATE: { name="neko"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko"; } - src= sourceFromHead "neko-F_01-20-32.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/neko-F_01-20-32.tar.gz"; sha256 = "785449f6df718fe26b6c87a2b7aa3cc587a72e7127582e6300ce966d97d6d16b"; }); + # REGION AUTO UPDATE: { name="neko"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko"; groups = "haxe_group"; } + src = sourceFromHead "neko-F_23-45-39.tar.gz" + (fetchurl { url = "http://mawercer.de/~nix/repos/neko-F_23-45-39.tar.gz"; sha256 = "fc74720da7a80cc6f0f9ea9842df8a5fa78858f742171365fae66f0b9975d228"; }); # END # optionally remove apache mysql like gentoo does? From 6338c68dcd173efe81fed21646535095be72eb51 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 19 Apr 2010 09:29:06 +0000 Subject: [PATCH 268/313] Inherit from pythonPackages, not pkgs svn path=/nixpkgs/trunk/; revision=21152 --- pkgs/desktops/kde-4.4/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index c6715c9021a..e4d064798cc 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -106,7 +106,8 @@ pkgs.recurseIntoAttrs (rec { }; kdeadmin = import ./admin { - inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer; + inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 rhpl system_config_printer; + inherit (pkgs.pythonPackages) pycups; inherit kdelibs kdepimlibs kdebindings; inherit automoc4 phonon; }; @@ -190,7 +191,8 @@ pkgs.recurseIntoAttrs (rec { }; kdeutils = import ./utils { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups rhpl system_config_printer; + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 system_config_printer; + inherit (pkgs.pythonPackages) pycups rhpl; inherit kdelibs kdepimlibs kdebase kdebindings; inherit automoc4 phonon qimageblitz qca2; }; From 98c2d9c38648003c968958a607bbf146081a8062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 19 Apr 2010 09:50:12 +0000 Subject: [PATCH 269/313] Removing the amarok dependency on qscriptgenerator. It builds fine, even in x86_64, where it failed. svn path=/nixpkgs/trunk/; revision=21153 --- pkgs/desktops/kde-4.4/default.nix | 2 +- pkgs/desktops/kde-4.4/extragear/amarok/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index e4d064798cc..516a3d586d5 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -219,7 +219,7 @@ pkgs.recurseIntoAttrs (rec { #### EXTRA GEAR amarok = import ./extragear/amarok { - inherit (pkgs) stdenv fetchurl lib cmake qt4 qtscriptgenerator perl gettext; + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext; inherit (pkgs) curl mysql libxml2 taglib taglib_extras loudmouth; inherit kdelibs; inherit automoc4 phonon strigi soprano qca2; diff --git a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix index 0219ac411cb..0222041beb3 100644 --- a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth +{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon, strigi, soprano, qca2}: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { inherit mysql loudmouth; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; builder = ./builder.sh; - buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth + buildInputs = [ cmake qt4 perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi soprano qca2]; meta = { description = "Popular music player for KDE"; From 673d1674fba3f013f6f21dd38ce9e44b46863c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 19 Apr 2010 10:24:09 +0000 Subject: [PATCH 270/313] Making kdeadmin build (pkgs => pythonpackages change) svn path=/nixpkgs/trunk/; revision=21154 --- pkgs/desktops/kde-4.4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 516a3d586d5..de9d53eeb37 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -106,8 +106,8 @@ pkgs.recurseIntoAttrs (rec { }; kdeadmin = import ./admin { - inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 rhpl system_config_printer; - inherit (pkgs.pythonPackages) pycups; + inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 system_config_printer; + inherit (pkgs.pythonPackages) pycups rhpl; inherit kdelibs kdepimlibs kdebindings; inherit automoc4 phonon; }; From 8cf18e0ae4ba92313c4131d665be70cafb9e2e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 19 Apr 2010 10:24:13 +0000 Subject: [PATCH 271/313] Revert "Removing the amarok dependency on qscriptgenerator." Amarok wants it. svn path=/nixpkgs/trunk/; revision=21155 --- pkgs/desktops/kde-4.4/default.nix | 2 +- pkgs/desktops/kde-4.4/extragear/amarok/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index de9d53eeb37..213d0958aed 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -219,7 +219,7 @@ pkgs.recurseIntoAttrs (rec { #### EXTRA GEAR amarok = import ./extragear/amarok { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext; + inherit (pkgs) stdenv fetchurl lib cmake qt4 qtscriptgenerator perl gettext; inherit (pkgs) curl mysql libxml2 taglib taglib_extras loudmouth; inherit kdelibs; inherit automoc4 phonon strigi soprano qca2; diff --git a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix index 0222041beb3..0219ac411cb 100644 --- a/pkgs/desktops/kde-4.4/extragear/amarok/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/amarok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth +{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon, strigi, soprano, qca2}: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { inherit mysql loudmouth; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; builder = ./builder.sh; - buildInputs = [ cmake qt4 perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth + buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi soprano qca2]; meta = { description = "Popular music player for KDE"; From 57f647c255452e86421342169127854a4b7d3822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 19 Apr 2010 10:50:36 +0000 Subject: [PATCH 272/313] Fixing the nixpkgs evaluation (svnfs). I renamed the attr svnFS to svnfs, to match others 'xxxxfs'. Maybe it could have the name sshfsFuse too. I prefer svnfs, and I'd prefer 'sshfs' too, and not sshfsFuse. svn path=/nixpkgs/trunk/; revision=21160 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c52737372c..b52079ed9f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1609,8 +1609,8 @@ let inherit (perlPackages) LWP URI HTMLParser HTTPServerSimple Parent; }; - svnFS = import ../tools/filesystems/svnfs { - inherit fetchurl stdenv automake autoconf perl fuse subversion apr; + svnfs = import ../tools/filesystems/svnfs { + inherit fetchurl stdenv automake autoconf perl fuse subversion apr lib; }; system_config_printer = import ../tools/misc/system-config-printer { From f431b2ac38d060da93042dcc85744115463f5a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 19 Apr 2010 12:27:18 +0000 Subject: [PATCH 273/313] Fixing a Marc's url that pointed to his local filesystem. There are still things to improve in that package (description?) I'm trying to get hydra evaluate nixpkgs. svn path=/nixpkgs/trunk/; revision=21163 --- pkgs/development/tools/misc/usb-modeswitch/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index c93756ffa25..7d4380656e3 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -2,15 +2,13 @@ args: with args; stdenv.mkDerivation { - name = "usb-modeswitch-1.1.1"; + name = "usb-modeswitch-1.1.2"; - src = /tmp/marc/usb-modeswitch-1.1.1.tar.bz2; - /* + src = fetchurl { - url = - sha256 = "0f7da588yvb1d3l3gk5m0hrqlhg8m4gw93aip3dwkmnawz9r0qca"; + url = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-1.1.2.tar.bz2"; + sha256 = "1wzhd0r49nh5y43qrvsi3c7a29206zwd6v8xlpb8dqm40xg3j9nz"; }; - */ # make clean: we always build from source. It should be necessary on x86_64 only preConfigure = '' From 73b7a7fea727ab5ba7110bfd8fc1f9f7dce9b689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 19 Apr 2010 14:06:07 +0000 Subject: [PATCH 274/313] hwloc 1.0rc1. svn path=/nixpkgs/trunk/; revision=21166 --- pkgs/development/libraries/hwloc/default.nix | 22 +++++++++---------- .../development/libraries/hwloc/ncurses.patch | 13 +++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/libraries/hwloc/ncurses.patch diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 8dede02fb0a..53c33787da5 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,14 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, cairo, expat }: +{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses +, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "hwloc-0.9.2"; + name = "hwloc-1.0rc1"; src = fetchurl { - url = "http://www.open-mpi.org/software/hwloc/v0.9/downloads/${name}.tar.bz2"; - sha256 = "1smxvz2g05kci1ra78iqmgk02rym3qwh1mrm68rxv70fhqhvq741"; + url = "http://www.open-mpi.org/software/hwloc/v1.0/downloads/${name}.tar.bz2"; + sha256 = "0mgjlyfwp1pbl2312l9diwjw53yb9hb62slmvcb3xvhqdwvj0d7s"; }; - buildInputs = [ pkgconfig cairo expat ]; + patches = [ ./ncurses.patch ]; + + preConfigure = "autoreconf -vfi"; + + buildInputs = [ autoconf automake libtool pkgconfig cairo expat ncurses ]; doCheck = true; @@ -37,11 +42,6 @@ stdenv.mkDerivation rec { homepage = http://www.open-mpi.org/projects/hwloc/; maintainers = [ stdenv.lib.maintainers.ludo ]; - - # It doesn't support the BSDs. - platforms = stdenv.lib.platforms.linux - ++ stdenv.lib.platforms.darwin - ++ stdenv.lib.platforms.cygwin - /* ++ opensolaris */; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/hwloc/ncurses.patch b/pkgs/development/libraries/hwloc/ncurses.patch new file mode 100644 index 00000000000..58dffea5265 --- /dev/null +++ b/pkgs/development/libraries/hwloc/ncurses.patch @@ -0,0 +1,13 @@ +Help `configure' find `tparm' in libncurses. + +--- a/config/hwloc.m4 2010-04-19 14:25:53.000000000 +0200 ++++ b/config/hwloc.m4 2010-04-19 14:24:23.000000000 +0200 +@@ -285,7 +285,7 @@ EOF]) + LIBS= + AC_CHECK_HEADERS([curses.h], [ + AC_CHECK_HEADERS([term.h], [ +- AC_SEARCH_LIBS([tparm], [termcap curses], [ ++ AC_SEARCH_LIBS([tparm], [ncurses termcap curses], [ + AC_SUBST([HWLOC_TERMCAP_LIBS], ["$LIBS"]) + AC_DEFINE([HWLOC_HAVE_LIBTERMCAP], [1], + [Define to 1 if you have a library providing the termcap interface]) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b52079ed9f9..53860d05db3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4025,7 +4025,8 @@ let }; hwloc = import ../development/libraries/hwloc { - inherit fetchurl stdenv pkgconfig cairo expat; + inherit fetchurl stdenv pkgconfig cairo expat ncurses + autoconf automake libtool; }; hydraAntLogger = import ../development/libraries/java/hydra-ant-logger { From d64fc6e17cbe61501f157f3f7641b7cebfd0f63c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 19 Apr 2010 14:21:52 +0000 Subject: [PATCH 275/313] Commenting at release.nix how hydra will evaluate it. svn path=/nixpkgs/trunk/; revision=21167 --- pkgs/top-level/release.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 204c4220738..d5f29f6d784 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -1,3 +1,12 @@ +/* + This file will be evaluated by hydra with a call like this: + hydra_eval_jobs --gc-roots-dir \ + /nix/var/nix/gcroots/per-user/hydra/hydra-roots --argstr \ + system i686-linux --argstr system x86_64-linux --arg \ + nixpkgs "{outPath = ./}" .... release.nix + + Hydra can be installed with "nix-env -i hydra". +*/ with (import ./release-lib.nix); { From d75d0cbb6a351fa6ccbdcfe4abe96c8c582ea968 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Mon, 19 Apr 2010 16:47:41 +0000 Subject: [PATCH 276/313] Eclipse update svn path=/nixpkgs/trunk/; revision=21169 --- pkgs/applications/editors/eclipse/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index c7eadebda91..7085d703b5c 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -6,18 +6,18 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - name = "eclipse-3.5.1"; + name = "eclipse-3.5.2"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz; - sha256 = "132zd7q9q29h978wnlsfbrlszc85r1wj30yqs2aqbv3l5xgny1kk"; + url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk-x86_64.tar.gz; + md5 = "54e2ce0660b2b1b0eb4267acf70ea66d"; } else fetchurl { - url = http://mirrors.linux-bg.org/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk.tar.gz; - sha256 = "0a0lpa7gxg91zswpahi6fvg3csl4csvlym4z2ad5cc1d4yvicp56"; + url = http://mirror.selfnet.de/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz; + md5 = "bde55a2354dc224cf5f26e5320e72dac"; }; desktopItem = makeDesktopItem { From 6ef4de22590476ddfd5984bdf2a804f934e13095 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Mon, 19 Apr 2010 19:41:38 +0000 Subject: [PATCH 277/313] Lyx update svn path=/nixpkgs/trunk/; revision=21170 --- pkgs/applications/misc/lyx/default.nix | 17 +++++++++++++---- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index b047b8d3b08..2b646714706 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,15 +1,24 @@ # I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc -args: with args; +{ fetchurl, stdenv, texLive, python, makeWrapper +, libX11, qt +}: + stdenv.mkDerivation rec { - version = "1.6.4"; + version = "1.6.5"; name = "lyx-${version}"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/${name}.tar.bz2"; - sha256 = "1b56e53e6884a9f1417811c03e5c986d79955444e8169244a2b80b0709223d15"; + sha256 = "0xxj37l4ghaa2ij5nfxlg90rfw0znipigjlh271mfmwjw9ykcw1n"; }; - buildInputs = [texLive qt python]; + buildInputs = [texLive qt python makeWrapper ]; + + # don't ask me why it can't find libX11.so.6 + postInstall = '' + wrapProgram $out/bin/lyx \ + --prefix LD_LIBRARY_PATH ":" ${libX11}/lib + ''; meta = { description = "WYSIWYM frontend for LaTeX, DocBook, etc."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53860d05db3..46e68a7a7c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7579,7 +7579,8 @@ let }; lyx = import ../applications/misc/lyx { - inherit fetchurl stdenv texLive python; + inherit fetchurl stdenv texLive python makeWrapper; + inherit (xlibs) libX11; qt = qt4; }; From 97f2c09f97589b22535f2ded4bcbaa88dfb72bf1 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Mon, 19 Apr 2010 19:41:41 +0000 Subject: [PATCH 278/313] readding some python packages I dropped somehow by accident. This also updates some python libraries and fixes some things I forgot to patch svn path=/nixpkgs/trunk/; revision=21171 --- pkgs/development/python2-packages/default.nix | 83 +- .../python2-packages/pyopengl/default.nix | 16 +- .../development/python2-packages/pyqt/4.7.nix | 6 +- .../python2-packages/python-sip/4.10.nix | 4 +- pkgs/tools/filesystems/svnfs/default.nix | 7 +- pkgs/top-level/all-packages.nix | 5 +- pkgs/top-level/python-packages.nix | 785 ------------------ 7 files changed, 94 insertions(+), 812 deletions(-) delete mode 100644 pkgs/top-level/python-packages.nix diff --git a/pkgs/development/python2-packages/default.nix b/pkgs/development/python2-packages/default.nix index 0014e92f8cf..fa271de78e8 100644 --- a/pkgs/development/python2-packages/default.nix +++ b/pkgs/development/python2-packages/default.nix @@ -9,10 +9,8 @@ rec { # pythonPackages # only keep packages being known to build with this python version b = builtins.removeAttrs allPythonPackages - (["foolscap" - "nevow" - "setuptoolsTrial" - "simplejson" + ([ "setuptoolsTrial" + "simplejson" ] # these packages don't build with specific python versions.. ++ (pkgs.lib.optionals (python.libPrefix == "python2.6") []) @@ -39,6 +37,65 @@ rec { inherit (b) setuptools; }; + beautifulsoap = b.buildPythonPackage (rec { + name = "beautifulsoap-3.0.8"; + + src = fetchurl { + url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.0.8.tar.gz"; + sha256 = "1gasiy5lwbhsxw27g36d88n36xbj52434klisvqhljgckd4xqcy7"; + }; + + # No tests implemented + doCheck = false; + + meta = { + homepage = http://www.crummy.com/software/BeautifulSoup/; + + license = "bsd"; + + description = "Undemanding HTML/XML parser"; + }; + }); + + clientform = b.buildPythonPackage (rec { + name = "clientform-0.2.10"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/C/ClientForm/ClientForm-0.2.10.tar.gz"; + sha256 = "0dydh3i1sx7rrj6d0gj375wkjpiivm7jjlsimw6hmwv4ck7yf1wm"; + }; + + meta = { + homepage = http://wwwsearch.sourceforge.net/ClientForm/; + + license = "bsd"; + + description = "Python module for handling HTML forms on the client side"; + }; + }); + + cssutils = b.buildPythonPackage (rec { + name = "cssutils-0.9.7a2"; + + src = fetchurl { + url = http://cssutils.googlecode.com/files/cssutils-0.9.7a2.zip; + sha256 = "068p14qhhczpjgn0w7v57a2swj0g4rndhimh8gkg9h9sd7rp6n07"; + }; + + buildInputs = [ pkgs.unzip ]; + + # The tests fail - I don't know why + doCheck = false; + + meta = { + description = "A Python package to parse and build CSS"; + + homepage = http://code.google.com/p/cssutils/; + + license = "LGPLv3+"; + }; + }); + foursuite = import ./4suite { inherit fetchurl stdenv python; }; @@ -110,7 +167,7 @@ rec { pyopengl = import ./pyopengl { inherit fetchurl stdenv python; - inherit (b) setuptools; + inherit (b) buildPythonPackage; inherit (pkgs) mesa freeglut pil; }; @@ -871,6 +928,22 @@ rec { inherit (b) setuptools; }; + zopeInterface = b.buildPythonPackage { + name = "zope-interface-3.3.0"; + src = fetchurl { + url = http://www.zope.org/Products/ZopeInterface/3.3.0/zope.interface-3.3.0.tar.gz; + sha256 = "0xahg9cmagn4j3dbifvgzbjliw2jdrbf27fhqwkdp8j80xpyyjf0"; + }; + + doCheck = false; + + meta = { + description = "Zope.Interface"; + homepage = http://zope.org/Products/ZopeInterface; + license = "ZPL"; + }; + }; + }; }.result diff --git a/pkgs/development/python2-packages/pyopengl/default.nix b/pkgs/development/python2-packages/pyopengl/default.nix index 6a8008d2525..60746c34a82 100644 --- a/pkgs/development/python2-packages/pyopengl/default.nix +++ b/pkgs/development/python2-packages/pyopengl/default.nix @@ -1,8 +1,8 @@ -{ fetchurl, stdenv, python, setuptools, mesa, freeglut, pil }: +{ fetchurl, stdenv, python, mesa, freeglut, pil, buildPythonPackage }: let version = "3.0.0b5"; in - stdenv.mkDerivation { + buildPythonPackage { name = "pyopengl-${version}"; src = fetchurl { @@ -10,17 +10,7 @@ in sha256 = "1rjpl2qdcqn4wamkik840mywdycd39q8dn3wqfaiv35jdsbifxx3"; }; - # Note: We need `ctypes', available in Python 2.5+. - buildInputs = [ python ]; - propagatedBuildInputs = [ setuptools mesa freeglut pil ]; - - configurePhase = "ensureDir $out/lib/python2.5/site-packages"; - buildPhase = "python setup.py build"; - - installPhase = '' - PYTHONPATH="$out/lib/python2.5/site-packages:$PYTHONPATH" \ - python setup.py install --prefix=$out - ''; + propagatedBuildInputs = [ mesa freeglut pil ]; meta = { homepage = http://pyopengl.sourceforge.net/; diff --git a/pkgs/development/python2-packages/pyqt/4.7.nix b/pkgs/development/python2-packages/pyqt/4.7.nix index eb09a32d00c..820e272dee1 100644 --- a/pkgs/development/python2-packages/pyqt/4.7.nix +++ b/pkgs/development/python2-packages/pyqt/4.7.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, python, sip, qt4}: stdenv.mkDerivation { - name = "pyqt-x11-gpl-4.7.2"; + name = "pyqt-x11-gpl-4.7.3"; src = fetchurl { - url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.2.tar.gz; - sha256 = "097gxdr7jqv5a58z89djylm2b21x83crqn2fjsr5zmwhc0zwj5yv"; + url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.3.tar.gz; + sha256 = "0p12m2rjsm3igpqqmgn79my2h16vhxq8dma9ih1744hpnirdcjjp"; }; configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins"; diff --git a/pkgs/development/python2-packages/python-sip/4.10.nix b/pkgs/development/python2-packages/python-sip/4.10.nix index c64d7be52f7..c1812bfec22 100644 --- a/pkgs/development/python2-packages/python-sip/4.10.nix +++ b/pkgs/development/python2-packages/python-sip/4.10.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "sip-4.10.1"; + name = "sip-4.10.2"; src = fetchurl { url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz"; - sha256 = "16pdk86amcl4hnc9vv2y1ihl8ym9hjkh49andm4jahv4630qhc9h"; + sha256 = "1vw810fa3g59r3cnfizxykq7dg84zcgs278cwrksk7rsgz8gdn9q"; }; configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include"; diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index c4cd2670e89..4d04bf6ff3c 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl, automake, autoconf, subversion, fuse, apr, perl }: + stdenv.mkDerivation { name = "svnfs"; @@ -22,7 +23,7 @@ stdenv.mkDerivation { description = "SvnFs is a filesystem written using FUSE for accessing Subversion repositories"; homepage = http://www.jmadden.eu/index.php/svnfs/; license = "GPLv2"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46e68a7a7c7..ab1a67993eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1237,7 +1237,7 @@ let import ../development/python2-packages/generic { inherit makeWrapper lib; python = pythonFull; - setuptools = builderDefsPackage (import ../development/python-modules/setuptools) { + setuptools = builderDefsPackage (import ../development/python2-packages/setuptools) { inherit makeWrapper; python = pythonFull; }; @@ -5317,6 +5317,9 @@ let wxPython = wxPython26; sip = pythonPackages.sip; xmpppy = pythonPackages.xmpppy; + pycups = pythonPackages.pycups; + rhpl = pythonPackages.rhpl; + nevow = pythonPackages.nevow; # 2.6 aliases wxPython26 = python26Packages.wxPython; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix deleted file mode 100644 index 16a6544f3ff..00000000000 --- a/pkgs/top-level/python-packages.nix +++ /dev/null @@ -1,785 +0,0 @@ -{ pkgs, python, buildPythonPackage }: - -rec { - inherit (pkgs) fetchurl fetchsvn stdenv; - - argparse = buildPythonPackage (rec { - name = "argparse-0.9.1"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/a/argparse/${name}.zip"; - sha256 = "00jw32wwccpf9smraywjk869b93w7f99rw8gi63yfhw6379fnq6m"; - }; - - buildInputs = [ pkgs.unzip ]; - - # How do we run the tests? - doCheck = false; - - meta = { - homepage = http://code.google.com/p/argparse/; - - license = "Apache License 2.0"; - - description = "argparse: Python command line parser"; - - longDescription = '' - The argparse module makes writing command line tools in Python - easy. Just briefly describe your command line interface and - argparse will take care of the rest, including: parsing the - arguments and flags from sys.argv, converting arg strings into - objects for your program, formatting and printing any help - messages, and much more. - ''; - }; - }); - - beautifulsoap = buildPythonPackage (rec { - name = "beautifulsoap-3.0.8"; - - src = fetchurl { - url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.0.8.tar.gz"; - sha256 = "1gasiy5lwbhsxw27g36d88n36xbj52434klisvqhljgckd4xqcy7"; - }; - - # No tests implemented - doCheck = false; - - meta = { - homepage = http://www.crummy.com/software/BeautifulSoup/; - - license = "bsd"; - - description = "Undemanding HTML/XML parser"; - }; - }); - - boto = buildPythonPackage (rec { - name = "boto-1.9b"; - - src = fetchurl { - url = "http://boto.googlecode.com/files/${name}.tar.gz"; - sha256 = "0kir3ddm79rxdf7wb5czmxpbnqzgj3j966q4mach29kkb98p48wz"; - }; - - meta = { - homepage = http://code.google.com/p/boto/; - - license = "bsd"; - - description = "Python interface to Amazon Web Services"; - - longDescription = '' - The boto module is an integrated interface to current and - future infrastructural services offered by Amazon Web - Services. This includes S3, SQS, EC2, among others. - ''; - }; - }); - - clientform = buildPythonPackage (rec { - name = "clientform-0.2.10"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/C/ClientForm/ClientForm-0.2.10.tar.gz"; - sha256 = "0dydh3i1sx7rrj6d0gj375wkjpiivm7jjlsimw6hmwv4ck7yf1wm"; - }; - - meta = { - homepage = http://wwwsearch.sourceforge.net/ClientForm/; - - license = "bsd"; - - description = "Python module for handling HTML forms on the client side"; - }; - }); - - cssutils = buildPythonPackage (rec { - name = "cssutils-0.9.7a2"; - - src = fetchurl { - url = http://cssutils.googlecode.com/files/cssutils-0.9.7a2.zip; - sha256 = "068p14qhhczpjgn0w7v57a2swj0g4rndhimh8gkg9h9sd7rp6n07"; - }; - - buildInputs = [ pkgs.unzip ]; - - # The tests fail - I don't know why - doCheck = false; - - meta = { - description = "A Python package to parse and build CSS"; - - homepage = http://code.google.com/p/cssutils/; - - license = "LGPLv3+"; - }; - }); - - darcsver = buildPythonPackage (rec { - name = "darcsver-1.3.1"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz"; - sha256 = "1a5cl2yhnd88a4vkc9r381cbjkcvga87dp9zx5av68857q1nvvvq"; - }; - - # Note: We don't actually need to provide Darcs as a build input. - # Darcsver will DTRT when Darcs isn't available. See news.gmane.org - # http://thread.gmane.org/gmane.comp.file-systems.tahoe.devel/3200 for a - # discussion. - - meta = { - description = "Darcsver, generate a version number from Darcs history"; - - homepage = http://pypi.python.org/pypi/darcsver; - - license = "BSD-style"; - }; - }); - - dateutil = buildPythonPackage (rec { - name = "dateutil-1.4.1"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz"; - sha256 = "0mrkh932k8s74h4rpgksvpmwbrrkq8zn78gbgwc22i2vlp31bdkl"; - }; - - meta = { - description = "Powerful extensions to the standard datetime module"; - - homepage = http://pypi.python.org/pypi/python-dateutil; - - license = "BSD-style"; - }; - }); - - foolscap = buildPythonPackage (rec { - name = "foolscap-0.4.2"; - - src = fetchurl { - url = "http://foolscap.lothar.com/releases/${name}.tar.gz"; - sha256 = "14g89kjxxci3ssl9jgvpkyrcq62g361aw8pamlkclk8nnrh4f776"; - }; - - propagatedBuildInputs = [ twisted pkgs.pyopenssl ]; - - # For some reason "python setup.py test" doesn't work with Python 2.6. - doCheck = false; - - meta = { - homepage = http://foolscap.lothar.com/; - - description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model"; - - longDescription = '' - "Foolscap" is the name for the next-generation RPC protocol, - intended to replace Perspective Broker (part of Twisted). - Foolscap is a protocol to implement a distributed - object-capabilities model in Python. - ''; - - # See http://foolscap.lothar.com/trac/browser/LICENSE. - license = "MIT"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; - }; - }); - - genshi = buildPythonPackage { - name = "genshi-0.5.1"; - - src = fetchurl { - url = http://ftp.edgewall.com/pub/genshi/Genshi-0.5.1.tar.bz2; - sha256 = "1g2xw3zvgz59ilv7mrdlnvfl6ph8lwflwd4jr6zwrca2zhj7d8rs"; - }; - - patches = - [ # Fix `make check' (http://bugs.gentoo.org/276299) - (fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/dev-python/genshi/files/genshi-0.5.1_test_fix.patch?rev=1.1"; - sha256 = "019skkas07lc2kjy5br5jhhf9dqfy4fs389m5f4ws3fc62fklwhk"; - }) - ]; - - buildInputs = [ pkgs.setuptools ]; - - meta = { - description = "Python components for parsing HTML, XML and other textual content"; - - longDescription = '' - Python library that provides an integrated set of - components for parsing, generating, and processing HTML, XML or other - textual content for output generation on the web. - ''; - - license = "BSD"; - }; - }; - - jinja2 = buildPythonPackage { - name = "jinja2-2.2.1"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.2.1.tar.gz"; - md5 = "fea849d68891218eb0b21c170f1c32d5"; - }; - - meta = { - homepage = http://jinja.pocoo.org/; - description = "Stand-alone template engine"; - license = "BSD"; - longDescription = '' - Jinja2 is a template engine written in pure Python. It provides a - Django inspired non-XML syntax but supports inline expressions and - an optional sandboxed environment. - ''; - }; - }; - - lxml = buildPythonPackage ( rec { - name = "lxml-2.2.2"; - - src = fetchurl { - url = http://pypi.python.org/packages/source/l/lxml/lxml-2.2.2.tar.gz; - sha256 = "0zjpsy67wcs69qhb06ficl3a5z229hmczpr8h84rkk05vaagj8qv"; - }; - - buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; - - meta = { - description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = http://codespeak.net/lxml/index.html; - license = "BSD"; - }; - }); - - matplotlib = buildPythonPackage ( rec { - name = "matplotlib-0.99.1.2"; - - src = fetchurl { - url = "http://downloads.sourceforge.net/matplotlib/${name}.tar.gz"; - sha256 = "12lhwgkahck795946hb8wp605c912zq9ds8067ybbifqs56q24b9"; - }; - - doCheck = false; - - buildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ]; - - meta = { - description = "python plotting library, making publication quality plots"; - homepage = "http://matplotlib.sourceforge.net/"; - }; - }); - - mechanize = buildPythonPackage (rec { - name = "mechanize-0.1.11"; - - src = fetchurl { - url = "http://wwwsearch.sourceforge.net/mechanize/src/${name}.tar.gz"; - sha256 = "1h62mwy4iz09jqz17nrb9j8y0djd500zdfqwrz9xmdwqzqwixkj2"; - }; - - propagatedBuildInputs = [ clientform ]; - - meta = { - description = "Stateful programmatic web browsing in Python"; - - homepage = http://wwwsearch.sourceforge.net/; - - license = "BSD-style"; - }; - }); - - namebench = buildPythonPackage (rec { - name = "namebench-1.0.5"; - - src = fetchurl { - url = "http://namebench.googlecode.com/files/${name}.tgz"; - sha256 = "6cbde35ce94d1f31e7d48f5d8eec13238b4dbc505675a33f1e183e600c1482c3"; - }; - - # No support of GUI yet. - - doCheck = false; - - meta = { - homepage = http://namebench.googlecode.com/; - description = "Find fastest DNS servers available"; - license = [ - "Apache-2.0" - # third-party program licenses (embedded in the sources) - "LGPL" # Crystal_Clear - "free" # dns - "Apache-2.0" # graphy - "BSD" # jinja2 - ]; - longDescription = '' - It hunts down the fastest DNS servers available for your computer to - use. namebench runs a fair and thorough benchmark using your web - browser history, tcpdump output, or standardized datasets in order - to provide an individualized recommendation. namebench is completely - free and does not modify your system in any way. - ''; - }; - }); - - nevow = buildPythonPackage (rec { - name = "nevow-0.9.33"; - - src = fetchurl { - url = "http://divmod.org/trac/attachment/wiki/SoftwareReleases/Nevow-0.9.33.tar.gz?format=raw"; - sha256 = "1b6zhfxx247b60n1qi2hrawhiaah88v8igg37pf7rjkmvy2z1c6c"; - name = "${name}.tar.gz"; - }; - - propagatedBuildInputs = [ twisted ]; - - postInstall = "twistd --help > /dev/null"; - - meta = { - description = "Nevow, a web application construction kit for Python"; - - longDescription = '' - Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow - is a web application construction kit written in Python. It is - designed to allow the programmer to express as much of the view - logic as desired in Python, and includes a pure Python XML - expression syntax named stan to facilitate this. However it - also provides rich support for designer-edited templates, using - a very small XML attribute language to provide bi-directional - template manipulation capability. - - Nevow also includes formless, a declarative syntax for - specifying the types of method parameters and exposing these - methods to the web. Forms can be rendered automatically, and - form posts will be validated and input coerced, rendering error - pages if appropriate. Once a form post has validated - successfully, the method will be called with the coerced values. - ''; - - homepage = http://divmod.org/trac/wiki/DivmodNevow; - - license = "BSD-style"; - }; - }); - - numpy = buildPythonPackage ( rec { - name = "numpy-1.3.0"; - - src = fetchurl { - url = "http://downloads.sourceforge.net/numpy/${name}.tar.gz"; - sha256 = "7524687cce85aa78103046db5e617c626b0ef871a203a049159f88f35647c90d"; - }; - - doCheck = false; - - buildInputs = [ pkgs.liblapack pkgs.blas /* pkgs.gfortran */ ]; - - # The build should be run as follows: - # - # python setup.py config_fc --fcompiler=gnu95 build - # python setup.py config_fc --fcompiler=gnu95 install - # - # But I con't figure out how to pass the extra flags to setuptools. - - meta = { - description = "Scientific tools for Python"; - homepage = "http://numpy.scipy.org/"; - }; - }); - - ply = buildPythonPackage (rec { - name = "ply-3.2"; - - src = fetchurl { - url = "http://www.dabeaz.com/ply/${name}.tar.gz"; - sha256 = "10z4xq8lc8c21v4g7z3zpnvpqbc0vidigrck1kqhwgkqi4gh0kfj"; - }; - - meta = { - homepage = http://www.dabeaz.com/ply/; - - description = "PLY (Python Lex-Yacc), an implementation of the lex and yacc parsing tools for Python"; - - longDescription = '' - PLY is an implementation of lex and yacc parsing tools for Python. - In a nutshell, PLY is nothing more than a straightforward lex/yacc - implementation. Here is a list of its essential features: It's - implemented entirely in Python; It uses LR-parsing which is - reasonably efficient and well suited for larger grammars; PLY - provides most of the standard lex/yacc features including support for - empty productions, precedence rules, error recovery, and support for - ambiguous grammars; PLY is straightforward to use and provides very - extensive error checking; PLY doesn't try to do anything more or less - than provide the basic lex/yacc functionality. In other words, it's - not a large parsing framework or a component of some larger system. - ''; - - license = "revised-BSD"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; - }; - }); - - psycopg2 = buildPythonPackage rec { - name = "psycopg2-2.0.13"; - - doCheck = false; - - src = fetchurl { - url = "http://initd.org/pub/software/psycopg/PSYCOPG-2-0/${name}.tar.gz"; - sha256 = "0arkaa1nbbd3pyn4l1bc75wi7nff3vxxh4s8sj5al5hv20p64pm1"; - }; - - propagatedBuildInputs = [ pkgs.postgresql ]; - - meta = { - description = "PostgreSQL database adapter for the Python programming language"; - license = "GPLv2/ZPL"; - }; - }; - - pycryptopp = buildPythonPackage (rec { - name = "pycryptopp-0.5.15"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz"; - sha256 = "0f8v3cs8vjpj423yx3ikj7qjvljrm86x0qpkckidv69kah8kndxa"; - }; - - # Use our own copy of Crypto++. - preConfigure = "export PYCRYPTOPP_DISABLE_EMBEDDED_CRYPTOPP=1"; - - buildInputs = [ setuptoolsDarcs darcsver pkgs.cryptopp ]; - - meta = { - homepage = http://allmydata.org/trac/pycryptopp; - - description = "Python wrappers for the Crypto++ library"; - - license = "GPLv2+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.linux; - }; - }); - - pyopengl = - let version = "3.0.0b5"; - in - buildPythonPackage { - name = "pyopengl-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/pyopengl/PyOpenGL-${version}.tar.gz"; - sha256 = "1rjpl2qdcqn4wamkik840mywdycd39q8dn3wqfaiv35jdsbifxx3"; - }; - - propagatedBuildInputs = with pkgs; [ mesa freeglut pil ]; - - meta = { - homepage = http://pyopengl.sourceforge.net/; - description = "PyOpenGL, the Python OpenGL bindings"; - - longDescription = '' - PyOpenGL is the cross platform Python binding to OpenGL and - related APIs. The binding is created using the standard (in - Python 2.5) ctypes library, and is provided under an extremely - liberal BSD-style Open-Source license. - ''; - - license = "BSD-style"; - }; - }; - - pysqlite = buildPythonPackage (rec { - name = "pysqlite-2.5.5"; - - src = fetchurl { - url = "http://pysqlite.googlecode.com/files/${name}.tar.gz"; - sha256 = "ef7ca7f44893790e1a7084b10ea083770e138689406fddc7076d12d6bff4d44f"; - }; - - # Since the `.egg' file is zipped, the `NEEDED' of the `.so' files - # it contains is not taken into account. Thus, we must explicitly make - # it a propagated input. - propagatedBuildInputs = [ pkgs.sqlite ]; - - patchPhase = '' - substituteInPlace "setup.cfg" \ - --replace "/usr/local/include" "${pkgs.sqlite}/include" \ - --replace "/usr/local/lib" "${pkgs.sqlite}/lib" - ''; - - # FIXME: How do we run the tests? - doCheck = false; - - meta = { - homepage = http://pysqlite.org/; - - description = "Python bindings for the SQLite embedded relational database engine"; - - longDescription = '' - pysqlite is a DB-API 2.0-compliant database interface for SQLite. - - SQLite is a relational database management system contained in - a relatively small C library. It is a public domain project - created by D. Richard Hipp. Unlike the usual client-server - paradigm, the SQLite engine is not a standalone process with - which the program communicates, but is linked in and thus - becomes an integral part of the program. The library - implements most of SQL-92 standard, including transactions, - triggers and most of complex queries. - - pysqlite makes this powerful embedded SQL engine available to - Python programmers. It stays compatible with the Python - database API specification 2.0 as much as possible, but also - exposes most of SQLite's native API, so that it is for example - possible to create user-defined SQL functions and aggregates - in Python. - ''; - - license = "revised BSD"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; - }; - }); - - pyutil = buildPythonPackage (rec { - name = "pyutil-1.3.30"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pyutil/${name}.tar.gz"; - sha256 = "1ksb4gn8x53wcyddmjv1ma8cvvhjlmfxc6kpszyhb838i7xzla19"; - }; - - buildInputs = [ setuptoolsDarcs ]; - propagatedBuildInputs = [ zbase32 argparse ]; - - meta = { - description = "Pyutil, a collection of mature utilities for Python programmers"; - - longDescription = '' - These are a few data structures, classes and functions which - we've needed over many years of Python programming and which - seem to be of general use to other Python programmers. Many of - the modules that have existed in pyutil over the years have - subsequently been obsoleted by new features added to the - Python language or its standard library, thus showing that - we're not alone in wanting tools like these. - ''; - - homepage = http://allmydata.org/trac/pyutil; - - license = "GPLv2+"; - }; - }); - - pyyaml = buildPythonPackage (rec { - name = "PyYAML-3.09"; - - src = fetchurl { - url = "http://pyyaml.org/download/pyyaml/PyYAML-3.09.zip"; - sha256 = "204aca8b42dbe90e460794d743dd16182011da85507bfd4f092f9f76e0688040"; - }; - - buildInputs = [ pkgs.unzip pkgs.pyrex ]; - propagatedBuildInputs = [ pkgs.libyaml ]; - - meta = { - description = "The next generation YAML parser and emitter for Python"; - homepage = http://pyyaml.org; - license = "free"; # !? - }; - }); - - setuptoolsDarcs = buildPythonPackage { - name = "setuptools-darcs-1.2.8"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/s/setuptools_darcs/setuptools_darcs-1.2.8.tar.gz"; - sha256 = "0jg9q9mhsky444mm7lpmmlxai8hmjg4pc71viv4kni8gls0gk9n8"; - }; - - propagatedBuildInputs = [ pkgs.darcs ]; - - meta = { - description = "setuptools plugin for the Darcs version control system"; - - homepage = http://allmydata.org/trac/setuptools_darcs; - - license = "BSD"; - }; - }; - - setuptoolsTrial = buildPythonPackage { - name = "setuptools-trial-0.5.3"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/s/setuptools_trial/setuptools_trial-0.5.3.tar.gz"; - sha256 = "0h3mgjsz3z1sjl9j0b6bv4bss8d0przamj4gnjmpyazc633hhlyi"; - }; - - propagatedBuildInputs = [ twisted ]; - - meta = { - description = "setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)"; - - homepage = http://allmydata.org/trac/setuptools_trial; - - license = "unspecified"; # ! - }; - }; - - simplejson = buildPythonPackage (rec { - name = "simplejson-2.0.9"; - - src = fetchsvn { - url = "http://simplejson.googlecode.com/svn/tags/${name}"; - sha256 = "a48d5256fdb4f258c33da3dda110ecf3c786f086dcb08a01309acde6d1ddb921"; - rev = "172"; # to be on the safe side - }; - - meta = { - description = "simplejson is a simple, fast, extensible JSON encoder/decoder for Python"; - - longDescription = '' - simplejson is compatible with Python 2.4 and later with no - external dependencies. It covers the full JSON specification - for both encoding and decoding, with unicode support. By - default, encoding is done in an encoding neutral fashion (plain - ASCII with \uXXXX escapes for unicode characters). - ''; - - homepage = http://code.google.com/p/simplejson/; - - license = "MIT"; - }; - }); - - trac = buildPythonPackage { - name = "trac-0.11.5"; - - src = fetchurl { - url = http://ftp.edgewall.com/pub/trac/Trac-0.11.5.tar.gz; - sha256 = "cc3362ecc533abc1755dd78e2d096d1413bc975abc3185318f4821458cd6a8ac"; - }; - - doCheck = false; - - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - - propagatedBuildInputs = [ genshi pkgs.setuptools ]; - - meta = { - description = "Enhanced wiki and issue tracking system for software development projects"; - - license = "BSD"; - }; - }; - - twisted = buildPythonPackage { - name = "twisted-8.2.0"; - - src = fetchurl { - url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.2/Twisted-8.2.0.tar.bz2; - sha256 = "1c6zplisjdnjzkfs0ld3a0f7m7xbjgx5rcwsdw5i1xiibsq2nq70"; - }; - - propagatedBuildInputs = [ zopeInterface ]; - - # Generate Twisted's plug-in cache. Twited users must do it as well. See - # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 - # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for - # details. - postInstall = "$out/bin/twistd --help > /dev/null"; - - meta = { - homepage = http://twistedmatrix.com/; - - description = "Twisted, an event-driven networking engine written in Python"; - - longDescription = '' - Twisted is an event-driven networking engine written in Python - and licensed under the MIT license. - ''; - - license = "MIT"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; - }; - }; - - zbase32 = buildPythonPackage (rec { - name = "zbase32-1.1.1"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zbase32/${name}.tar.gz"; - sha256 = "0n59l4rs26vrhxpsfrwybjjir68aj23f09k1yjnbxqy5n0khp8gm"; - }; - - # Tests require `pyutil' so disable them to avoid circular references. - doCheck = false; - - buildInputs = [ setuptoolsDarcs ]; - - meta = { - description = "zbase32, a base32 encoder/decoder"; - - homepage = http://pypi.python.org/pypi/zbase32; - - license = "BSD"; - }; - }); - - zfec = buildPythonPackage (rec { - name = "zfec-1.4.4"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zfec/${name}.tar.gz"; - sha256 = "0rgg7nsvbr4f9xmiclzypc39fnivg23kldv5aa8si0bgsxn6mh6w"; - }; - - buildInputs = [ setuptoolsDarcs ]; - propagatedBuildInputs = [ pyutil argparse ]; - - meta = { - homepage = http://allmydata.org/trac/zfec; - - description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; - - longDescription = '' - Fast, portable, programmable erasure coding a.k.a. "forward - error correction": the generation of redundant blocks of - information such that if some blocks are lost then the - original data can be recovered from the remaining blocks. The - zfec package includes command-line tools, C API, Python API, - and Haskell API. - ''; - - license = "GPLv2+"; - }; - }); - - zopeInterface = buildPythonPackage { - name = "zope-interface-3.3.0"; - src = fetchurl { - url = http://www.zope.org/Products/ZopeInterface/3.3.0/zope.interface-3.3.0.tar.gz; - sha256 = "0xahg9cmagn4j3dbifvgzbjliw2jdrbf27fhqwkdp8j80xpyyjf0"; - }; - - doCheck = false; - - meta = { - description = "Zope.Interface"; - homepage = http://zope.org/Products/ZopeInterface; - license = "ZPL"; - }; - }; -} From 9571bbe5dcc387d6a84c94a7bea007d897a9be05 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Mon, 19 Apr 2010 23:44:00 +0000 Subject: [PATCH 279/313] Python: - simplejson builds - remove merge duplication of ZopeInterface (doCheck = false is not needed) - document why those packgaes don't build svn path=/nixpkgs/trunk/; revision=21174 --- .../ZopeInterface/default.nix | 12 ---------- pkgs/development/python2-packages/default.nix | 22 ++++++++++--------- 2 files changed, 12 insertions(+), 22 deletions(-) delete mode 100644 pkgs/development/python2-packages/ZopeInterface/default.nix diff --git a/pkgs/development/python2-packages/ZopeInterface/default.nix b/pkgs/development/python2-packages/ZopeInterface/default.nix deleted file mode 100644 index 6bcedcd0f17..00000000000 --- a/pkgs/development/python2-packages/ZopeInterface/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, python}: - -stdenv.mkDerivation { - name = "ZopeInterface-3.3.0"; - src = fetchurl { - url = http://www.zope.org/Products/ZopeInterface/3.3.0/zope.interface-3.3.0.tar.gz; - sha256 = "0xahg9cmagn4j3dbifvgzbjliw2jdrbf27fhqwkdp8j80xpyyjf0"; - }; - buildInputs = [python]; - buildPhase = "true"; - installPhase = "python ./setup.py install --prefix=$out"; -} diff --git a/pkgs/development/python2-packages/default.nix b/pkgs/development/python2-packages/default.nix index fa271de78e8..83b9ad8ff35 100644 --- a/pkgs/development/python2-packages/default.nix +++ b/pkgs/development/python2-packages/default.nix @@ -10,12 +10,20 @@ rec { # only keep packages being known to build with this python version b = builtins.removeAttrs allPythonPackages ([ "setuptoolsTrial" - "simplejson" ] # these packages don't build with specific python versions.. - ++ (pkgs.lib.optionals (python.libPrefix == "python2.6") []) + ++ (pkgs.lib.optionals (python.libPrefix == "python2.6") + [ + # pythonSexy fails with: /nix/store/8ls1xar0wsxmczas4sr76n1dwpccram9-pygtk-2.16.0/bin/pygtk-codegen-2.0: line 10: exec: /nix/store/8ls1xar0wsxmczas4sr76n1dwpccram9-pygtk-2.16.0/bin/pygobject-codegen-2.0: cannot execute: No such file or directory + "pythonSexy" + ]) ++ (pkgs.lib.optionals (python.libPrefix == "python2.5") - ["pycairo" "pygtk" "pyGtkGlade" "rhpl" "pygobject" "pythonSexy"]) + [ + # pygtk requires at least python-2.6. The other packages in this line depend on pygtk + "pygobject" "pycairo" "pygtk" "pyGtkGlade" "pythonSexy" + # rhpl fails with: diskutil.c:24:20: error: Python.h: No such file or directory + "rhpl" + ]) ); result = b // { @@ -247,10 +255,6 @@ rec { inherit (pkgs) wxGTK; }; - ZopeInterface = import ./ZopeInterface { - inherit fetchurl stdenv python; - }; - argparse = b.buildPythonPackage (rec { name = "argparse-0.9.1"; @@ -792,7 +796,7 @@ rec { }; }; - simplejson = b.b.buildPythonPackage (rec { + simplejson = b.buildPythonPackage (rec { name = "simplejson-2.0.9"; src = fetchsvn { @@ -935,8 +939,6 @@ rec { sha256 = "0xahg9cmagn4j3dbifvgzbjliw2jdrbf27fhqwkdp8j80xpyyjf0"; }; - doCheck = false; - meta = { description = "Zope.Interface"; homepage = http://zope.org/Products/ZopeInterface; From 3fd8596707afca7debb4215f7184655c15bb99fa Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 20 Apr 2010 00:03:14 +0000 Subject: [PATCH 280/313] pythonPackages should include python svn path=/nixpkgs/trunk/; revision=21175 --- pkgs/development/python2-packages/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python2-packages/default.nix b/pkgs/development/python2-packages/default.nix index 83b9ad8ff35..2cf908f3bff 100644 --- a/pkgs/development/python2-packages/default.nix +++ b/pkgs/development/python2-packages/default.nix @@ -28,6 +28,9 @@ rec { result = b // { all = builtins.removeAttrs b ["buildPythonPackage"]; + # also pass this python version so that you can do: + # inherit (pythonXYPackages) python libA libB; + inherit python; }; # intentionally not using rec. Using b so that if a depedency doesn't build @@ -777,7 +780,7 @@ rec { }; }; - setuptoolsTrial = b.b.buildPythonPackage { + setuptoolsTrial = b.buildPythonPackage { name = "setuptools-trial-0.5.3"; src = fetchurl { From fb6e817495d8bea902ab4f9659f5a5a4665e8773 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 20 Apr 2010 09:36:57 +0000 Subject: [PATCH 281/313] SIP 4.10 and PyQt 4.7 are now the default versions svn path=/nixpkgs/trunk/; revision=21179 --- pkgs/development/python2-packages/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python2-packages/default.nix b/pkgs/development/python2-packages/default.nix index 2cf908f3bff..dc50182e67a 100644 --- a/pkgs/development/python2-packages/default.nix +++ b/pkgs/development/python2-packages/default.nix @@ -213,7 +213,8 @@ rec { inherit (pkgs) rpm cpio wirelesstools gettext; }; - sip = b.sip48; + sip = b.sip410; + sip48 = import ./python-sip { inherit stdenv fetchurl python; }; @@ -222,7 +223,7 @@ rec { inherit stdenv fetchurl python; }; - pyqt4 = b.pyqt45; + pyqt4 = b.pyqt47; pyqt45 = import ./pyqt/4.5.nix { inherit stdenv fetchurl python; From 3921737991184b10d0b6377a442da73d05e57c33 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 20 Apr 2010 11:29:40 +0000 Subject: [PATCH 282/313] Upgraded jdk to 1.6.0_20 svn path=/nixpkgs/trunk/; revision=21180 --- pkgs/development/compilers/jdk/jdk6-linux.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix index 4c12e01d70f..ddada14008b 100644 --- a/pkgs/development/compilers/jdk/jdk6-linux.nix +++ b/pkgs/development/compilers/jdk/jdk6-linux.nix @@ -13,18 +13,18 @@ assert swingSupport -> xlibs != null; stdenv.mkDerivation ({ name = - if installjdk then "jdk-1.6.0_16" else "jre-1.6.0_16"; + if installjdk then "jdk-1.6.0_20" else "jre-1.6.0_20"; src = if stdenv.system == "i686-linux" then fetchurl { - url = http://download.java.net/dlj/binaries/jdk-6u16-dlj-linux-i586.bin; - sha256 = "18syxbfsch7j109qcgjh510yvksbzxawf8ij67mx7p92icgf9ss6"; + url = http://download.java.net/dlj/binaries/jdk-6u20-dlj-linux-i586.bin; + sha256 = "1gjd8y7d0a07lpl6x5j8wgyagf2kspl7xs0xf1k9pd8qzlw17z6v"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = http://download.java.net/dlj/binaries/jdk-6u16-dlj-linux-amd64.bin; - sha256 = "1kxk9wp7i5ymcpnp48qxjbkr749nshi068yld4q3rx2s3hvi824k"; + url = http://download.java.net/dlj/binaries/jdk-6u20-dlj-linux-amd64.bin; + sha256 = "124a5lpcqx3nh3n968rvaca0clj4crfmxlgy2db227vllc2jlj0y"; } else abort "jdk requires i686-linux or x86_64 linux"; From fbc33c54854cc584a09ff02924af012ff8c3717a Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 20 Apr 2010 14:32:07 +0000 Subject: [PATCH 283/313] maven-build.nix: added extraMvnFlags argurment svn path=/nixpkgs/trunk/; revision=21181 --- pkgs/build-support/release/maven-build.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix index 8fbd7f0677b..2fa42dd1b10 100644 --- a/pkgs/build-support/release/maven-build.nix +++ b/pkgs/build-support/release/maven-build.nix @@ -7,12 +7,12 @@ , doCheckstyle ? false , doRelease ? false , includeTestClasses ? true - +, extraMvnFlags ? "" , ... } @ args : let - mvnFlags = "-Dmaven.repo.local=$M2_REPO ${if doTest then "" else "-Dmaven.test.skip.exec=true"}"; + mvnFlags = "-Dmaven.repo.local=$M2_REPO ${if doTest then "" else "-Dmaven.test.skip.exec=true"} ${extraMvnFlags}"; in stdenv.mkDerivation ( rec { From 71760b99a5e9fa8460bf53e80095f341e2d1664d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 20 Apr 2010 15:09:56 +0000 Subject: [PATCH 284/313] Fixing the opencv build. As it builds with cmake, it also benefits from 'stdenv2' to build properly. svn path=/nixpkgs/trunk/; revision=21184 --- pkgs/development/libraries/opencv/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 244c3886822..1a295f7da7d 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -2,11 +2,11 @@ xineLib, gstreamer }: stdenv.mkDerivation rec { - name = "opencv-2.0.0"; + name = "opencv-2.1.0"; src = fetchurl { - url = "mirror://sourceforge/opencvlibrary/OpenCV-2.0.0.tar.bz2"; - sha256 = "08h03qzawj6zwifrh8rq66y4cya1kxx9ixrbq7phlac79nbvjzf1"; + url = "mirror://sourceforge/opencvlibrary/OpenCV-2.1.0.tar.bz2"; + sha256 = "0zrr24hr64gz35qb95nsvvbmdf89biglpy9z14y5kaxh5baiy1i6"; }; buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab1a67993eb..216716bb7e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4735,10 +4735,11 @@ let }; opencv = import ../development/libraries/opencv { - inherit fetchurl stdenv cmake libjpeg libpng libtiff jasper ffmpeg + inherit fetchurl cmake libjpeg libpng libtiff jasper ffmpeg pkgconfig xineLib; inherit (gtkLibs) gtk glib; inherit (gst_all) gstreamer; + stdenv = stdenv2; }; # this ctl version is needed by openexr_viewers From 7a3f60258029dd36d44ccd243d7f15a6aa7ef6d9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Apr 2010 17:06:19 +0000 Subject: [PATCH 285/313] Get rid of decibel and tapioca-qt It never worked, and nothing use it. svn path=/nixpkgs/trunk/; revision=21185 --- pkgs/desktops/kde-4.4/default.nix | 6 +----- pkgs/desktops/kde-4.4/network/default.nix | 4 ++-- .../desktops/kde-4.4/support/decibel/default.nix | 16 ---------------- .../development/libraries/tapioca-qt/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 4 ---- 5 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 pkgs/desktops/kde-4.4/support/decibel/default.nix delete mode 100644 pkgs/development/libraries/tapioca-qt/default.nix diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 213d0958aed..3e71c3aad5e 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -44,10 +44,6 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 soprano; }; - decibel = import ./support/decibel { - inherit (pkgs) stdenv fetchurl lib cmake qt4 tapioca_qt telepathy_qt; - }; - eigen = import ./support/eigen { inherit (pkgs) stdenv fetchurl lib cmake; }; @@ -150,7 +146,7 @@ pkgs.recurseIntoAttrs (rec { kdenetwork = import ./network { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib; - inherit (pkgs) libidn libvncserver tapioca_qt libmsn giflib gpgme boost libv4l; + inherit (pkgs) libidn libvncserver libmsn giflib gpgme boost libv4l; inherit (pkgs.xlibs) libXi libXtst libXdamage libXxf86vm; inherit kdelibs kdepimlibs; inherit automoc4 phonon qca2 soprano qimageblitz strigi; diff --git a/pkgs/desktops/kde-4.4/network/default.nix b/pkgs/desktops/kde-4.4/network/default.nix index 63c6fb733d3..8192b06da94 100644 --- a/pkgs/desktops/kde-4.4/network/default.nix +++ b/pkgs/desktops/kde-4.4/network/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn -, libvncserver, tapioca_qt, libmsn, giflib, gpgme, boost, libv4l +, libvncserver, libmsn, giflib, gpgme, boost, libv4l , libXi, libXtst, libXdamage, libXxf86vm , kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}: @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "08rlbixv1q3x3zscyfr2jpdr33rgaw54hyszyd92ny6l13g2hf56"; }; buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn - libvncserver tapioca_qt libmsn giflib gpgme boost stdenv.gcc.libc libv4l + libvncserver libmsn giflib gpgme boost stdenv.gcc.libc libv4l libXi libXtst libXdamage libXxf86vm kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz strigi ]; meta = { diff --git a/pkgs/desktops/kde-4.4/support/decibel/default.nix b/pkgs/desktops/kde-4.4/support/decibel/default.nix deleted file mode 100644 index ad6eaa98fe9..00000000000 --- a/pkgs/desktops/kde-4.4/support/decibel/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, lib, cmake, qt4, tapioca_qt, telepathy_qt}: - -stdenv.mkDerivation { - name = "decibel-0.5.0"; - src = fetchurl { - url = http://decibel.kde.org/fileadmin/downloads/decibel/releases/decibel-0.5.0.tar.gz; - md5 = "7de299ace568c87a746388ad765228e5"; - }; - buildInputs = [ cmake qt4 tapioca_qt telepathy_qt ]; - meta = { - description = "Realtime communications framework for KDE"; - license = "LGPL"; - homepage = http://decibel.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/development/libraries/tapioca-qt/default.nix b/pkgs/development/libraries/tapioca-qt/default.nix deleted file mode 100644 index 5d5fad9d928..00000000000 --- a/pkgs/development/libraries/tapioca-qt/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, telepathy_qt}: - -stdenv.mkDerivation { - name = "tapioca-qt-0.14.1"; - src = fetchurl { - url = mirror://sourceforge/tapioca-voip/tapioca-qt-0.14.1.tar.gz; - md5 = "169318705af6386057b537c5317d520d"; - }; - buildInputs = [ cmake qt4 telepathy_qt ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 216716bb7e1..80423a146fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5003,10 +5003,6 @@ let inherit stdenv fetchurl cmake taglib; }; - tapioca_qt = import ../development/libraries/tapioca-qt { - inherit stdenv fetchurl cmake qt4 telepathy_qt; - }; - tdb = import ../development/libraries/tdb { inherit fetchurl stdenv libxslt libxml2 docbook_xsl; }; From 4cdcafb0f168ad138636963381cc47db7e48402d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Apr 2010 17:06:27 +0000 Subject: [PATCH 286/313] Don't pass lib argument to svnfs as it is not expected svn path=/nixpkgs/trunk/; revision=21186 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80423a146fb..cdaf9aaa8c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1610,7 +1610,7 @@ let }; svnfs = import ../tools/filesystems/svnfs { - inherit fetchurl stdenv automake autoconf perl fuse subversion apr lib; + inherit fetchurl stdenv automake autoconf perl fuse subversion apr; }; system_config_printer = import ../tools/misc/system-config-printer { From 445a3e07e90570ea2a0b2636c6ed62ce3e2c1f0d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 20 Apr 2010 17:06:38 +0000 Subject: [PATCH 287/313] Don't disable pythonSexy for python 2.6 Otherwise tarball build fails. svn path=/nixpkgs/trunk/; revision=21187 --- pkgs/development/python2-packages/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python2-packages/default.nix b/pkgs/development/python2-packages/default.nix index dc50182e67a..78b3ae759f7 100644 --- a/pkgs/development/python2-packages/default.nix +++ b/pkgs/development/python2-packages/default.nix @@ -15,7 +15,8 @@ rec { ++ (pkgs.lib.optionals (python.libPrefix == "python2.6") [ # pythonSexy fails with: /nix/store/8ls1xar0wsxmczas4sr76n1dwpccram9-pygtk-2.16.0/bin/pygtk-codegen-2.0: line 10: exec: /nix/store/8ls1xar0wsxmczas4sr76n1dwpccram9-pygtk-2.16.0/bin/pygobject-codegen-2.0: cannot execute: No such file or directory - "pythonSexy" + # Don't disable it even if it fails. Disabling breaks nixpkgs tarball + #"pythonSexy" ]) ++ (pkgs.lib.optionals (python.libPrefix == "python2.5") [ From f2307e254351b7166b29985654de3ea040f914aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 20 Apr 2010 18:29:50 +0000 Subject: [PATCH 288/313] Fixing the mechanize python package. That may make calibre build again. svn path=/nixpkgs/trunk/; revision=21191 --- pkgs/development/python2-packages/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python2-packages/default.nix b/pkgs/development/python2-packages/default.nix index 78b3ae759f7..30e595a6e00 100644 --- a/pkgs/development/python2-packages/default.nix +++ b/pkgs/development/python2-packages/default.nix @@ -477,6 +477,8 @@ rec { sha256 = "1h62mwy4iz09jqz17nrb9j8y0djd500zdfqwrz9xmdwqzqwixkj2"; }; + propagatedBuildInputs = [ b.clientform ]; + meta = { description = "Stateful programmatic web browsing in Python"; @@ -856,7 +858,7 @@ rec { sha256 = "1c6zplisjdnjzkfs0ld3a0f7m7xbjgx5rcwsdw5i1xiibsq2nq70"; }; - propagatedBuildInputs = [ b.ZopeInterface ]; + propagatedBuildInputs = [ b.zopeInterface ]; # Generate Twisted's plug-in cache. Twited users must do it as well. See # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 From 85c1a2b7ff95f5ccd5f06a72a2ae3f373434eebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 21 Apr 2010 07:00:49 +0000 Subject: [PATCH 289/313] "Remind" update. svn path=/nixpkgs/trunk/; revision=21193 --- pkgs/tools/misc/remind/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 9a88d7a979f..b679218db79 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,15 +1,17 @@ {stdenv, fetchurl} : stdenv.mkDerivation { - name = "remind-3.1.6"; + name = "remind-3.1.8"; src = fetchurl { - url = http://www.roaringpenguin.com/files/download/remind-03.01.06.tar.gz; - sha256 = "acdf73904c95de55b615d80c7c007abe58d75e41978a16a43333a22583ac7738"; + url = http://www.roaringpenguin.com/files/download/remind-03.01.08.tar.gz; + sha256 = "0gvizrpkbanm515bhd6mq9xxs4g4ji9pplswaj4plaqsk3yw0qjw"; }; meta = { homepage = http://www.roaringpenguin.com/products/remind; description = "Sophisticated calendar and alarm program for the console"; license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; }; } From ac5555e40c92d2bf34779d612714bf056be8079b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Apr 2010 09:47:26 +0000 Subject: [PATCH 290/313] * Subversion 1.6.11. Also updated meta.homepage to reflect that it's now an Apache project. svn path=/nixpkgs/trunk/; revision=21194 --- .../version-management/subversion/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 08169a0b039..2dae1b344fc 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -19,20 +19,19 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.6.9"; + version = "1.6.11"; name = "subversion-${version}"; src = fetchurl { url = "http://subversion.tigris.org/downloads/${name}.tar.bz2"; - sha1 = "477aa89e60de7974ac0aa921cc369b4c2907693c"; + sha256 = "177565kvn9kq3i8xrvh86cwl7098v2ymhmvjq11x6w04wc501gb4"; }; - buildInputs = [zlib apr aprutil sqlite] + buildInputs = [ zlib apr aprutil sqlite ] ++ stdenv.lib.optional httpSupport neon ++ stdenv.lib.optional pythonBindings python - ++ stdenv.lib.optional perlBindings perl - ; + ++ stdenv.lib.optional perlBindings perl; configureFlags = '' --disable-keychain @@ -72,7 +71,7 @@ stdenv.mkDerivation rec { meta = { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; - homepage = http://subversion.tigris.org/; + homepage = http://subversion.apache.org/; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; From 8d9ac92768e2781c742a3dc9b7e0e2b976c966f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 21 Apr 2010 10:38:12 +0000 Subject: [PATCH 291/313] Enabling again the setuptoolsTrial python package, so at least the nixpkgs tarball does not fail. svn path=/nixpkgs/trunk/; revision=21195 --- pkgs/development/python2-packages/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python2-packages/default.nix b/pkgs/development/python2-packages/default.nix index 30e595a6e00..f80062308b0 100644 --- a/pkgs/development/python2-packages/default.nix +++ b/pkgs/development/python2-packages/default.nix @@ -9,10 +9,9 @@ rec { # pythonPackages # only keep packages being known to build with this python version b = builtins.removeAttrs allPythonPackages - ([ "setuptoolsTrial" - ] + ( # these packages don't build with specific python versions.. - ++ (pkgs.lib.optionals (python.libPrefix == "python2.6") + (pkgs.lib.optionals (python.libPrefix == "python2.6") [ # pythonSexy fails with: /nix/store/8ls1xar0wsxmczas4sr76n1dwpccram9-pygtk-2.16.0/bin/pygtk-codegen-2.0: line 10: exec: /nix/store/8ls1xar0wsxmczas4sr76n1dwpccram9-pygtk-2.16.0/bin/pygobject-codegen-2.0: cannot execute: No such file or directory # Don't disable it even if it fails. Disabling breaks nixpkgs tarball From e2a374799fc9e93034fbb75b12f597b874cb00dd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Apr 2010 10:51:15 +0000 Subject: [PATCH 292/313] * Reverted most of the recent Python refactorings, as discussed. It's a worthy goal to move the Python packages that are currently in all-packages.nix into a single attribute set, but this doesn't require moving python-packages.nix or the other changes made to that file. The Python packages in all-packages.nix should simply be moved to python-packages.nix, and ideally changed to use buildPythonPackage. svn path=/nixpkgs/trunk/; revision=21196 --- pkgs/desktops/kde-4.4/default.nix | 6 +- .../4suite/default.nix | 0 .../bsddb3/default.nix | 0 .../dbus/default.nix | 0 .../flup/default.nix | 0 .../generic/default.nix | 0 .../irclib/default.nix | 0 .../libsexy/default.nix | 0 .../numeric/default.nix | 0 .../pil/default.nix | 0 .../psyco/default.nix | 0 .../pycairo/default.nix | 0 .../pycrypto/default.nix | 0 .../pycups/default.nix | 0 .../pygame/default.nix | 0 .../pygobject/default.nix | 0 .../pygtk/default.nix | 0 .../pyopenssl/default.nix | 0 .../pyqt/default.nix} | 6 +- .../python-sip/default.nix} | 4 +- .../pyx/default.nix | 0 .../pyxml/default.nix | 0 .../rhpl/builder.sh | 0 .../rhpl/default.nix | 0 .../setuptools/default.nix | 0 .../stringtemplate/default.nix | 0 .../wxPython/2.6.nix | 0 .../wxPython/2.8.nix | 0 .../wxPython/builder.sh | 0 .../xmpppy/default.nix | 0 .../python-modules/zope/default.nix | 15 + .../zope/zope_python-2.4.4.patch | 0 .../zope/zope_python-readline.patch | 0 pkgs/development/python2-packages/default.nix | 957 ------------------ .../python2-packages/pyopengl/default.nix | 28 - .../development/python2-packages/pyqt/4.5.nix | 22 - .../python2-packages/python-sip/default.nix | 20 - pkgs/tools/filesystems/svnfs/default.nix | 7 +- pkgs/top-level/all-packages.nix | 223 +++- pkgs/top-level/python-packages.nix | 785 ++++++++++++++ 40 files changed, 980 insertions(+), 1093 deletions(-) rename pkgs/development/{python2-packages => python-modules}/4suite/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/bsddb3/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/dbus/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/flup/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/generic/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/irclib/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/libsexy/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/numeric/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/pil/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/psyco/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/pycairo/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/pycrypto/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/pycups/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/pygame/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/pygobject/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/pygtk/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/pyopenssl/default.nix (100%) rename pkgs/development/{python2-packages/pyqt/4.7.nix => python-modules/pyqt/default.nix} (81%) rename pkgs/development/{python2-packages/python-sip/4.10.nix => python-modules/python-sip/default.nix} (83%) rename pkgs/development/{python2-packages => python-modules}/pyx/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/pyxml/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/rhpl/builder.sh (100%) rename pkgs/development/{python2-packages => python-modules}/rhpl/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/setuptools/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/stringtemplate/default.nix (100%) rename pkgs/development/{python2-packages => python-modules}/wxPython/2.6.nix (100%) rename pkgs/development/{python2-packages => python-modules}/wxPython/2.8.nix (100%) rename pkgs/development/{python2-packages => python-modules}/wxPython/builder.sh (100%) rename pkgs/development/{python2-packages => python-modules}/xmpppy/default.nix (100%) create mode 100644 pkgs/development/python-modules/zope/default.nix rename pkgs/development/{python2-packages => python-modules}/zope/zope_python-2.4.4.patch (100%) rename pkgs/development/{python2-packages => python-modules}/zope/zope_python-readline.patch (100%) delete mode 100644 pkgs/development/python2-packages/default.nix delete mode 100644 pkgs/development/python2-packages/pyopengl/default.nix delete mode 100644 pkgs/development/python2-packages/pyqt/4.5.nix delete mode 100644 pkgs/development/python2-packages/python-sip/default.nix create mode 100644 pkgs/top-level/python-packages.nix diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 3e71c3aad5e..9623f309fc9 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -102,8 +102,7 @@ pkgs.recurseIntoAttrs (rec { }; kdeadmin = import ./admin { - inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 system_config_printer; - inherit (pkgs.pythonPackages) pycups rhpl; + inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer; inherit kdelibs kdepimlibs kdebindings; inherit automoc4 phonon; }; @@ -187,8 +186,7 @@ pkgs.recurseIntoAttrs (rec { }; kdeutils = import ./utils { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 system_config_printer; - inherit (pkgs.pythonPackages) pycups rhpl; + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups rhpl system_config_printer; inherit kdelibs kdepimlibs kdebase kdebindings; inherit automoc4 phonon qimageblitz qca2; }; diff --git a/pkgs/development/python2-packages/4suite/default.nix b/pkgs/development/python-modules/4suite/default.nix similarity index 100% rename from pkgs/development/python2-packages/4suite/default.nix rename to pkgs/development/python-modules/4suite/default.nix diff --git a/pkgs/development/python2-packages/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix similarity index 100% rename from pkgs/development/python2-packages/bsddb3/default.nix rename to pkgs/development/python-modules/bsddb3/default.nix diff --git a/pkgs/development/python2-packages/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix similarity index 100% rename from pkgs/development/python2-packages/dbus/default.nix rename to pkgs/development/python-modules/dbus/default.nix diff --git a/pkgs/development/python2-packages/flup/default.nix b/pkgs/development/python-modules/flup/default.nix similarity index 100% rename from pkgs/development/python2-packages/flup/default.nix rename to pkgs/development/python-modules/flup/default.nix diff --git a/pkgs/development/python2-packages/generic/default.nix b/pkgs/development/python-modules/generic/default.nix similarity index 100% rename from pkgs/development/python2-packages/generic/default.nix rename to pkgs/development/python-modules/generic/default.nix diff --git a/pkgs/development/python2-packages/irclib/default.nix b/pkgs/development/python-modules/irclib/default.nix similarity index 100% rename from pkgs/development/python2-packages/irclib/default.nix rename to pkgs/development/python-modules/irclib/default.nix diff --git a/pkgs/development/python2-packages/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix similarity index 100% rename from pkgs/development/python2-packages/libsexy/default.nix rename to pkgs/development/python-modules/libsexy/default.nix diff --git a/pkgs/development/python2-packages/numeric/default.nix b/pkgs/development/python-modules/numeric/default.nix similarity index 100% rename from pkgs/development/python2-packages/numeric/default.nix rename to pkgs/development/python-modules/numeric/default.nix diff --git a/pkgs/development/python2-packages/pil/default.nix b/pkgs/development/python-modules/pil/default.nix similarity index 100% rename from pkgs/development/python2-packages/pil/default.nix rename to pkgs/development/python-modules/pil/default.nix diff --git a/pkgs/development/python2-packages/psyco/default.nix b/pkgs/development/python-modules/psyco/default.nix similarity index 100% rename from pkgs/development/python2-packages/psyco/default.nix rename to pkgs/development/python-modules/psyco/default.nix diff --git a/pkgs/development/python2-packages/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix similarity index 100% rename from pkgs/development/python2-packages/pycairo/default.nix rename to pkgs/development/python-modules/pycairo/default.nix diff --git a/pkgs/development/python2-packages/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix similarity index 100% rename from pkgs/development/python2-packages/pycrypto/default.nix rename to pkgs/development/python-modules/pycrypto/default.nix diff --git a/pkgs/development/python2-packages/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix similarity index 100% rename from pkgs/development/python2-packages/pycups/default.nix rename to pkgs/development/python-modules/pycups/default.nix diff --git a/pkgs/development/python2-packages/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix similarity index 100% rename from pkgs/development/python2-packages/pygame/default.nix rename to pkgs/development/python-modules/pygame/default.nix diff --git a/pkgs/development/python2-packages/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix similarity index 100% rename from pkgs/development/python2-packages/pygobject/default.nix rename to pkgs/development/python-modules/pygobject/default.nix diff --git a/pkgs/development/python2-packages/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix similarity index 100% rename from pkgs/development/python2-packages/pygtk/default.nix rename to pkgs/development/python-modules/pygtk/default.nix diff --git a/pkgs/development/python2-packages/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix similarity index 100% rename from pkgs/development/python2-packages/pyopenssl/default.nix rename to pkgs/development/python-modules/pyopenssl/default.nix diff --git a/pkgs/development/python2-packages/pyqt/4.7.nix b/pkgs/development/python-modules/pyqt/default.nix similarity index 81% rename from pkgs/development/python2-packages/pyqt/4.7.nix rename to pkgs/development/python-modules/pyqt/default.nix index 820e272dee1..eb09a32d00c 100644 --- a/pkgs/development/python2-packages/pyqt/4.7.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, python, sip, qt4}: stdenv.mkDerivation { - name = "pyqt-x11-gpl-4.7.3"; + name = "pyqt-x11-gpl-4.7.2"; src = fetchurl { - url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.3.tar.gz; - sha256 = "0p12m2rjsm3igpqqmgn79my2h16vhxq8dma9ih1744hpnirdcjjp"; + url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.2.tar.gz; + sha256 = "097gxdr7jqv5a58z89djylm2b21x83crqn2fjsr5zmwhc0zwj5yv"; }; configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins"; diff --git a/pkgs/development/python2-packages/python-sip/4.10.nix b/pkgs/development/python-modules/python-sip/default.nix similarity index 83% rename from pkgs/development/python2-packages/python-sip/4.10.nix rename to pkgs/development/python-modules/python-sip/default.nix index c1812bfec22..c64d7be52f7 100644 --- a/pkgs/development/python2-packages/python-sip/4.10.nix +++ b/pkgs/development/python-modules/python-sip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "sip-4.10.2"; + name = "sip-4.10.1"; src = fetchurl { url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz"; - sha256 = "1vw810fa3g59r3cnfizxykq7dg84zcgs278cwrksk7rsgz8gdn9q"; + sha256 = "16pdk86amcl4hnc9vv2y1ihl8ym9hjkh49andm4jahv4630qhc9h"; }; configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include"; diff --git a/pkgs/development/python2-packages/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix similarity index 100% rename from pkgs/development/python2-packages/pyx/default.nix rename to pkgs/development/python-modules/pyx/default.nix diff --git a/pkgs/development/python2-packages/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix similarity index 100% rename from pkgs/development/python2-packages/pyxml/default.nix rename to pkgs/development/python-modules/pyxml/default.nix diff --git a/pkgs/development/python2-packages/rhpl/builder.sh b/pkgs/development/python-modules/rhpl/builder.sh similarity index 100% rename from pkgs/development/python2-packages/rhpl/builder.sh rename to pkgs/development/python-modules/rhpl/builder.sh diff --git a/pkgs/development/python2-packages/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix similarity index 100% rename from pkgs/development/python2-packages/rhpl/default.nix rename to pkgs/development/python-modules/rhpl/default.nix diff --git a/pkgs/development/python2-packages/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix similarity index 100% rename from pkgs/development/python2-packages/setuptools/default.nix rename to pkgs/development/python-modules/setuptools/default.nix diff --git a/pkgs/development/python2-packages/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix similarity index 100% rename from pkgs/development/python2-packages/stringtemplate/default.nix rename to pkgs/development/python-modules/stringtemplate/default.nix diff --git a/pkgs/development/python2-packages/wxPython/2.6.nix b/pkgs/development/python-modules/wxPython/2.6.nix similarity index 100% rename from pkgs/development/python2-packages/wxPython/2.6.nix rename to pkgs/development/python-modules/wxPython/2.6.nix diff --git a/pkgs/development/python2-packages/wxPython/2.8.nix b/pkgs/development/python-modules/wxPython/2.8.nix similarity index 100% rename from pkgs/development/python2-packages/wxPython/2.8.nix rename to pkgs/development/python-modules/wxPython/2.8.nix diff --git a/pkgs/development/python2-packages/wxPython/builder.sh b/pkgs/development/python-modules/wxPython/builder.sh similarity index 100% rename from pkgs/development/python2-packages/wxPython/builder.sh rename to pkgs/development/python-modules/wxPython/builder.sh diff --git a/pkgs/development/python2-packages/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix similarity index 100% rename from pkgs/development/python2-packages/xmpppy/default.nix rename to pkgs/development/python-modules/xmpppy/default.nix diff --git a/pkgs/development/python-modules/zope/default.nix b/pkgs/development/python-modules/zope/default.nix new file mode 100644 index 00000000000..3dc5da98e76 --- /dev/null +++ b/pkgs/development/python-modules/zope/default.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, python}: + +stdenv.mkDerivation rec { + version = "3.2.1"; + name = "zope-${version}"; + src = fetchurl { + url = "http://www.zope.org/Products/Zope3/${version}/Zope-${version}.tgz"; + sha256 = "8431984af75054e4ddfe45bf708924240f8b6b02220cd84d090138413ac82341"; + }; + patches = [ + ./zope_python-2.4.4.patch + ./zope_python-readline.patch + ]; + buildInputs = [python]; +} diff --git a/pkgs/development/python2-packages/zope/zope_python-2.4.4.patch b/pkgs/development/python-modules/zope/zope_python-2.4.4.patch similarity index 100% rename from pkgs/development/python2-packages/zope/zope_python-2.4.4.patch rename to pkgs/development/python-modules/zope/zope_python-2.4.4.patch diff --git a/pkgs/development/python2-packages/zope/zope_python-readline.patch b/pkgs/development/python-modules/zope/zope_python-readline.patch similarity index 100% rename from pkgs/development/python2-packages/zope/zope_python-readline.patch rename to pkgs/development/python-modules/zope/zope_python-readline.patch diff --git a/pkgs/development/python2-packages/default.nix b/pkgs/development/python2-packages/default.nix deleted file mode 100644 index f80062308b0..00000000000 --- a/pkgs/development/python2-packages/default.nix +++ /dev/null @@ -1,957 +0,0 @@ -{ pkgs, python, makeWrapper }: - -let inherit (pkgs) builderDefsPackage lib fetchurl fetchsvn stdenv zlib libjpeg; - -in - -rec { - - # pythonPackages - # only keep packages being known to build with this python version - b = builtins.removeAttrs allPythonPackages - ( - # these packages don't build with specific python versions.. - (pkgs.lib.optionals (python.libPrefix == "python2.6") - [ - # pythonSexy fails with: /nix/store/8ls1xar0wsxmczas4sr76n1dwpccram9-pygtk-2.16.0/bin/pygtk-codegen-2.0: line 10: exec: /nix/store/8ls1xar0wsxmczas4sr76n1dwpccram9-pygtk-2.16.0/bin/pygobject-codegen-2.0: cannot execute: No such file or directory - # Don't disable it even if it fails. Disabling breaks nixpkgs tarball - #"pythonSexy" - ]) - ++ (pkgs.lib.optionals (python.libPrefix == "python2.5") - [ - # pygtk requires at least python-2.6. The other packages in this line depend on pygtk - "pygobject" "pycairo" "pygtk" "pyGtkGlade" "pythonSexy" - # rhpl fails with: diskutil.c:24:20: error: Python.h: No such file or directory - "rhpl" - ]) - ); - - result = b // { - all = builtins.removeAttrs b ["buildPythonPackage"]; - # also pass this python version so that you can do: - # inherit (pythonXYPackages) python libA libB; - inherit python; - }; - - # intentionally not using rec. Using b so that if a depedency doesn't build - # its less work to find all depending packages - allPythonPackages = { - - setuptools = builderDefsPackage (import ./setuptools) { - inherit python; - inherit (pkgs) makeWrapper; - }; - - buildPythonPackage = - import ./generic { - inherit python makeWrapper lib; - inherit (b) setuptools; - }; - - beautifulsoap = b.buildPythonPackage (rec { - name = "beautifulsoap-3.0.8"; - - src = fetchurl { - url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.0.8.tar.gz"; - sha256 = "1gasiy5lwbhsxw27g36d88n36xbj52434klisvqhljgckd4xqcy7"; - }; - - # No tests implemented - doCheck = false; - - meta = { - homepage = http://www.crummy.com/software/BeautifulSoup/; - - license = "bsd"; - - description = "Undemanding HTML/XML parser"; - }; - }); - - clientform = b.buildPythonPackage (rec { - name = "clientform-0.2.10"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/C/ClientForm/ClientForm-0.2.10.tar.gz"; - sha256 = "0dydh3i1sx7rrj6d0gj375wkjpiivm7jjlsimw6hmwv4ck7yf1wm"; - }; - - meta = { - homepage = http://wwwsearch.sourceforge.net/ClientForm/; - - license = "bsd"; - - description = "Python module for handling HTML forms on the client side"; - }; - }); - - cssutils = b.buildPythonPackage (rec { - name = "cssutils-0.9.7a2"; - - src = fetchurl { - url = http://cssutils.googlecode.com/files/cssutils-0.9.7a2.zip; - sha256 = "068p14qhhczpjgn0w7v57a2swj0g4rndhimh8gkg9h9sd7rp6n07"; - }; - - buildInputs = [ pkgs.unzip ]; - - # The tests fail - I don't know why - doCheck = false; - - meta = { - description = "A Python package to parse and build CSS"; - - homepage = http://code.google.com/p/cssutils/; - - license = "LGPLv3+"; - }; - }); - - foursuite = import ./4suite { - inherit fetchurl stdenv python; - }; - - bsddb3 = import ./bsddb3 { - inherit fetchurl stdenv python; - inherit (pkgs) db4; - }; - - # python25 only? - flup = builderDefsPackage ./flup { - inherit fetchurl stdenv python; - inherit (b) setuptools; - }; - - numeric = import ./numeric { - inherit fetchurl stdenv python; - }; - - pil = import ./pil { - inherit fetchurl stdenv python; - inherit (pkgs) zlib libjpeg freetype; - }; - - #psyco = import ./psyco { - # inherit fetchurl stdenv python; - #}; - - pycairo = import ./pycairo { - inherit fetchurl stdenv python; - inherit (pkgs) cairo x11 pkgconfig; - }; - - pycrypto = import ./pycrypto { - inherit fetchurl stdenv python; - inherit (pkgs) gmp; - }; - - pycups = import ./pycups { - inherit stdenv fetchurl python; - inherit (pkgs) cups; - }; - - pygame = import ./pygame { - inherit fetchurl stdenv python; - inherit (pkgs) pkgconfig SDL SDL_image - SDL_mixer SDL_ttf numeric; - }; - - pygobject = import ./pygobject { - inherit fetchurl stdenv python; - inherit (pkgs) pkgconfig glib; - }; - - pygtk = import ./pygtk { - inherit fetchurl stdenv python; - inherit (b) pygobject pycairo; - inherit (pkgs) pkgconfig; - inherit (pkgs.gtkLibs) glib gtk; - }; - - pyGtkGlade = import ./pygtk { - inherit fetchurl stdenv python; - inherit (b) pygobject pycairo; - inherit (pkgs) pkgconfig; - inherit (pkgs.gtkLibs) glib gtk; - inherit (pkgs.gnome) libglade; - }; - - pyopengl = import ./pyopengl { - inherit fetchurl stdenv python; - inherit (b) buildPythonPackage; - inherit (pkgs) mesa freeglut pil; - }; - - pyopenssl = builderDefsPackage (import ./pyopenssl) { - inherit python; - inherit (pkgs) openssl; - }; - - pystringtemplate = import ./stringtemplate { - inherit stdenv fetchurl python; - inherit (pkgs) antlr; - }; - - pythonDBus = builderDefsPackage (import ./dbus) { - inherit python; - inherit (pkgs) pkgconfig dbus_glib; - dbus = pkgs.dbus.libs; - }; - - pythonIRClib = builderDefsPackage (import ./irclib) { - inherit python; - }; - - pythonSexy = builderDefsPackage (import ./libsexy) { - inherit python; - inherit (pkgs) pkgconfig libxml2 pygtk libsexy; - inherit (pkgs.gtkLibs) pango gtk glib; - }; - - rhpl = import ./rhpl { - inherit stdenv fetchurl python; - inherit (pkgs) rpm cpio wirelesstools gettext; - }; - - sip = b.sip410; - - sip48 = import ./python-sip { - inherit stdenv fetchurl python; - }; - - sip410 = import ./python-sip/4.10.nix { - inherit stdenv fetchurl python; - }; - - pyqt4 = b.pyqt47; - - pyqt45 = import ./pyqt/4.5.nix { - inherit stdenv fetchurl python; - inherit (b) sip; - qt4 = pkgs.qt45; - }; - - pyqt47 = import ./pyqt/4.7.nix { - inherit stdenv fetchurl python; - qt4 = pkgs.qt46; - sip = b.sip410; - }; - - pyx = import ./pyx { - inherit fetchurl stdenv python makeWrapper; - }; - - pyxml = import ./pyxml { - inherit fetchurl stdenv python makeWrapper; - }; - - wxPython = b.wxPython26; - - wxPython26 = import ./wxPython/2.6.nix { - inherit fetchurl stdenv python; - inherit (pkgs) pkgconfig; - wxGTK = pkgs.wxGTK26; - }; - - wxPython28 = import ./wxPython/2.8.nix { - inherit fetchurl stdenv python; - inherit (pkgs) pkgconfig; - inherit (pkgs) wxGTK; - }; - - argparse = b.buildPythonPackage (rec { - name = "argparse-0.9.1"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/a/argparse/${name}.zip"; - sha256 = "00jw32wwccpf9smraywjk869b93w7f99rw8gi63yfhw6379fnq6m"; - }; - - buildInputs = [ pkgs.unzip ]; - - # How do we run the tests? - doCheck = false; - - meta = { - homepage = http://code.google.com/p/argparse/; - - license = "Apache License 2.0"; - - description = "argparse: Python command line parser"; - - longDescription = '' - The argparse module makes writing command line tools in Python - easy. Just briefly describe your command line interface and - argparse will take care of the rest, including: parsing the - arguments and flags from sys.argv, converting arg strings into - objects for your program, formatting and printing any help - messages, and much more. - ''; - }; - }); - - boto = b.buildPythonPackage (rec { - name = "boto-1.9b"; - - src = fetchurl { - url = "http://boto.googlecode.com/files/${name}.tar.gz"; - sha256 = "0kir3ddm79rxdf7wb5czmxpbnqzgj3j966q4mach29kkb98p48wz"; - }; - - meta = { - homepage = http://code.google.com/p/boto/; - - license = "bsd"; - - description = "Python interface to Amazon Web Services"; - - longDescription = '' - The boto module is an integrated interface to current and - future infrastructural services offered by Amazon Web - Services. This includes S3, SQS, EC2, among others. - ''; - }; - }); - - darcsver = b.buildPythonPackage (rec { - name = "darcsver-1.3.1"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz"; - sha256 = "1a5cl2yhnd88a4vkc9r381cbjkcvga87dp9zx5av68857q1nvvvq"; - }; - - buildInputs = [ pkgs.darcs ]; - - meta = { - description = "Darcsver, generate a version number from Darcs history"; - - homepage = http://pypi.python.org/pypi/darcsver; - - license = "BSD-style"; - }; - }); - - dateutil = b.buildPythonPackage (rec { - name = "dateutil-1.4.1"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz"; - sha256 = "0mrkh932k8s74h4rpgksvpmwbrrkq8zn78gbgwc22i2vlp31bdkl"; - }; - - meta = { - description = "Powerful extensions to the standard datetime module"; - - homepage = http://pypi.python.org/pypi/python-dateutil; - - license = "BSD-style"; - }; - }); - - foolscap = b.buildPythonPackage (rec { - name = "foolscap-0.4.2"; - - src = fetchurl { - url = "http://foolscap.lothar.com/releases/${name}.tar.gz"; - sha256 = "14g89kjxxci3ssl9jgvpkyrcq62g361aw8pamlkclk8nnrh4f776"; - }; - - propagatedBuildInputs = [ b.twisted pkgs.pyopenssl ]; - - # For some reason "python setup.py test" doesn't work with Python 2.6. - doCheck = false; - - meta = { - homepage = http://foolscap.lothar.com/; - - description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model"; - - longDescription = '' - "Foolscap" is the name for the next-generation RPC protocol, - intended to replace Perspective Broker (part of Twisted). - Foolscap is a protocol to implement a distributed - object-capabilities model in Python. - ''; - - # See http://foolscap.lothar.com/trac/browser/LICENSE. - license = "MIT"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; - }; - }); - - genshi = b.buildPythonPackage { - name = "genshi-0.5.1"; - - src = fetchurl { - url = http://ftp.edgewall.com/pub/genshi/Genshi-0.5.1.tar.bz2; - sha256 = "1g2xw3zvgz59ilv7mrdlnvfl6ph8lwflwd4jr6zwrca2zhj7d8rs"; - }; - - patches = - [ # Fix `make check' (http://bugs.gentoo.org/276299) - (fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/dev-python/genshi/files/genshi-0.5.1_test_fix.patch?rev=1.1"; - sha256 = "019skkas07lc2kjy5br5jhhf9dqfy4fs389m5f4ws3fc62fklwhk"; - }) - ]; - - buildInputs = [ b.setuptools ]; - - meta = { - description = "Python components for parsing HTML, XML and other textual content"; - - longDescription = '' - Python library that provides an integrated set of - components for parsing, generating, and processing HTML, XML or other - textual content for output generation on the web. - ''; - - license = "BSD"; - }; - }; - - jinja2 = b.buildPythonPackage { - name = "jinja2-2.2.1"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.2.1.tar.gz"; - md5 = "fea849d68891218eb0b21c170f1c32d5"; - }; - - meta = { - homepage = http://jinja.pocoo.org/; - description = "Stand-alone template engine"; - license = "BSD"; - longDescription = '' - Jinja2 is a template engine written in pure Python. It provides a - Django inspired non-XML syntax but supports inline expressions and - an optional sandboxed environment. - ''; - }; - }; - - lxml = b.buildPythonPackage ( rec { - name = "lxml-2.2.2"; - - src = fetchurl { - url = http://pypi.python.org/packages/source/l/lxml/lxml-2.2.2.tar.gz; - sha256 = "0zjpsy67wcs69qhb06ficl3a5z229hmczpr8h84rkk05vaagj8qv"; - }; - - buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; - - meta = { - description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = http://codespeak.net/lxml/index.html; - license = "BSD"; - }; - }); - - matplotlib = b.buildPythonPackage ( rec { - name = "matplotlib-0.99.1.2"; - - src = fetchurl { - url = "http://downloads.sourceforge.net/matplotlib/${name}.tar.gz"; - sha256 = "12lhwgkahck795946hb8wp605c912zq9ds8067ybbifqs56q24b9"; - }; - - doCheck = false; - - buildInputs = [ b.dateutil b.numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ]; - - meta = { - description = "python plotting library, making publication quality plots"; - homepage = "http://matplotlib.sourceforge.net/"; - }; - }); - - mechanize = b.buildPythonPackage (rec { - name = "mechanize-0.1.11"; - - src = fetchurl { - url = "http://wwwsearch.sourceforge.net/mechanize/src/${name}.tar.gz"; - sha256 = "1h62mwy4iz09jqz17nrb9j8y0djd500zdfqwrz9xmdwqzqwixkj2"; - }; - - propagatedBuildInputs = [ b.clientform ]; - - meta = { - description = "Stateful programmatic web browsing in Python"; - - homepage = http://wwwsearch.sourceforge.net/; - - license = "BSD-style"; - }; - }); - - namebench = b.buildPythonPackage (rec { - name = "namebench-1.0.5"; - - src = fetchurl { - url = "http://namebench.googlecode.com/files/${name}.tgz"; - sha256 = "6cbde35ce94d1f31e7d48f5d8eec13238b4dbc505675a33f1e183e600c1482c3"; - }; - - # No support of GUI yet. - - doCheck = false; - - meta = { - homepage = http://namebench.googlecode.com/; - description = "Find fastest DNS servers available"; - license = [ - "Apache-2.0" - # third-party program licenses (embedded in the sources) - "LGPL" # Crystal_Clear - "free" # dns - "Apache-2.0" # graphy - "BSD" # jinja2 - ]; - longDescription = '' - It hunts down the fastest DNS servers available for your computer to - use. namebench runs a fair and thorough benchmark using your web - browser history, tcpdump output, or standardized datasets in order - to provide an individualized recommendation. namebench is completely - free and does not modify your system in any way. - ''; - }; - }); - - nevow = b.buildPythonPackage (rec { - name = "nevow-0.9.33"; - - src = fetchurl { - url = "http://divmod.org/trac/attachment/wiki/SoftwareReleases/Nevow-0.9.33.tar.gz?format=raw"; - sha256 = "1b6zhfxx247b60n1qi2hrawhiaah88v8igg37pf7rjkmvy2z1c6c"; - name = "${name}.tar.gz"; - }; - - propagatedBuildInputs = [ b.twisted ]; - - postInstall = "twistd --help > /dev/null"; - - meta = { - description = "Nevow, a web application construction kit for Python"; - - longDescription = '' - Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow - is a web application construction kit written in Python. It is - designed to allow the programmer to express as much of the view - logic as desired in Python, and includes a pure Python XML - expression syntax named stan to facilitate this. However it - also provides rich support for designer-edited templates, using - a very small XML attribute language to provide bi-directional - template manipulation capability. - - Nevow also includes formless, a declarative syntax for - specifying the types of method parameters and exposing these - methods to the web. Forms can be rendered automatically, and - form posts will be validated and input coerced, rendering error - pages if appropriate. Once a form post has validated - successfully, the method will be called with the coerced values. - ''; - - homepage = http://divmod.org/trac/wiki/DivmodNevow; - - license = "BSD-style"; - }; - }); - - numpy = b.buildPythonPackage ( rec { - name = "numpy-1.3.0"; - - src = fetchurl { - url = "http://downloads.sourceforge.net/numpy/${name}.tar.gz"; - sha256 = "7524687cce85aa78103046db5e617c626b0ef871a203a049159f88f35647c90d"; - }; - - doCheck = false; - - buildInputs = [ pkgs.liblapack pkgs.blas /* pkgs.gfortran */ ]; - - # The build should be run as follows: - # - # python setup.py config_fc --fcompiler=gnu95 build - # python setup.py config_fc --fcompiler=gnu95 install - # - # But I con't figure out how to pass the extra flags to setuptools. - - meta = { - description = "Scientific tools for Python"; - homepage = "http://numpy.scipy.org/"; - }; - }); - - ply = b.buildPythonPackage (rec { - name = "ply-3.2"; - - src = fetchurl { - url = "http://www.dabeaz.com/ply/${name}.tar.gz"; - sha256 = "10z4xq8lc8c21v4g7z3zpnvpqbc0vidigrck1kqhwgkqi4gh0kfj"; - }; - - meta = { - homepage = http://www.dabeaz.com/ply/; - - description = "PLY (Python Lex-Yacc), an implementation of the lex and yacc parsing tools for Python"; - - longDescription = '' - PLY is an implementation of lex and yacc parsing tools for Python. - In a nutshell, PLY is nothing more than a straightforward lex/yacc - implementation. Here is a list of its essential features: It's - implemented entirely in Python; It uses LR-parsing which is - reasonably efficient and well suited for larger grammars; PLY - provides most of the standard lex/yacc features including support for - empty productions, precedence rules, error recovery, and support for - ambiguous grammars; PLY is straightforward to use and provides very - extensive error checking; PLY doesn't try to do anything more or less - than provide the basic lex/yacc functionality. In other words, it's - not a large parsing framework or a component of some larger system. - ''; - - license = "revised-BSD"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; - }; - }); - - psycopg2 = b.buildPythonPackage rec { - name = "psycopg2-2.0.13"; - - doCheck = false; - - src = fetchurl { - url = "http://initd.org/pub/software/psycopg/PSYCOPG-2-0/${name}.tar.gz"; - sha256 = "0arkaa1nbbd3pyn4l1bc75wi7nff3vxxh4s8sj5al5hv20p64pm1"; - }; - - propagatedBuildInputs = [ pkgs.postgresql ]; - - meta = { - description = "PostgreSQL database adapter for the Python programming language"; - license = "GPLv2/ZPL"; - }; - }; - - pycryptopp = b.buildPythonPackage (rec { - name = "pycryptopp-0.5.15"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz"; - sha256 = "0f8v3cs8vjpj423yx3ikj7qjvljrm86x0qpkckidv69kah8kndxa"; - }; - - # Use our own copy of Crypto++. - preConfigure = "export PYCRYPTOPP_DISABLE_EMBEDDED_CRYPTOPP=1"; - - buildInputs = [ b.setuptoolsDarcs b.darcsver pkgs.cryptopp ]; - - meta = { - homepage = http://allmydata.org/trac/pycryptopp; - - description = "Python wrappers for the Crypto++ library"; - - license = "GPLv2+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.linux; - }; - }); - - pysqlite = b.buildPythonPackage (rec { - name = "pysqlite-2.5.5"; - - src = fetchurl { - url = "http://pysqlite.googlecode.com/files/${name}.tar.gz"; - sha256 = "ef7ca7f44893790e1a7084b10ea083770e138689406fddc7076d12d6bff4d44f"; - }; - - # Since the `.egg' file is zipped, the `NEEDED' of the `.so' files - # it contains is not taken into account. Thus, we must explicitly make - # it a propagated input. - propagatedBuildInputs = [ pkgs.sqlite ]; - - patchPhase = '' - substituteInPlace "setup.cfg" \ - --replace "/usr/local/include" "${pkgs.sqlite}/include" \ - --replace "/usr/local/lib" "${pkgs.sqlite}/lib" - ''; - - # FIXME: How do we run the tests? - doCheck = false; - - meta = { - homepage = http://pysqlite.org/; - - description = "Python bindings for the SQLite embedded relational database engine"; - - longDescription = '' - pysqlite is a DB-API 2.0-compliant database interface for SQLite. - - SQLite is a relational database management system contained in - a relatively small C library. It is a public domain project - created by D. Richard Hipp. Unlike the usual client-server - paradigm, the SQLite engine is not a standalone process with - which the program communicates, but is linked in and thus - becomes an integral part of the program. The library - implements most of SQL-92 standard, including transactions, - triggers and most of complex queries. - - pysqlite makes this powerful embedded SQL engine available to - Python programmers. It stays compatible with the Python - database API specification 2.0 as much as possible, but also - exposes most of SQLite's native API, so that it is for example - possible to create user-defined SQL functions and aggregates - in Python. - ''; - - license = "revised BSD"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; - }; - }); - - pyutil = b.buildPythonPackage (rec { - name = "pyutil-1.3.30"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pyutil/${name}.tar.gz"; - sha256 = "1ksb4gn8x53wcyddmjv1ma8cvvhjlmfxc6kpszyhb838i7xzla19"; - }; - - buildInputs = [ b.setuptoolsDarcs ]; - propagatedBuildInputs = [ b.zbase32 b.argparse ]; - - meta = { - description = "Pyutil, a collection of mature utilities for Python programmers"; - - longDescription = '' - These are a few data structures, classes and functions which - we've needed over many years of Python programming and which - seem to be of general use to other Python programmers. Many of - the modules that have existed in pyutil over the years have - subsequently been obsoleted by new features added to the - Python language or its standard library, thus showing that - we're not alone in wanting tools like these. - ''; - - homepage = http://allmydata.org/trac/pyutil; - - license = "GPLv2+"; - }; - }); - - pyyaml = b.buildPythonPackage (rec { - name = "PyYAML-3.09"; - - src = fetchurl { - url = "http://pyyaml.org/download/pyyaml/PyYAML-3.09.zip"; - sha256 = "204aca8b42dbe90e460794d743dd16182011da85507bfd4f092f9f76e0688040"; - }; - - buildInputs = [ pkgs.unzip pkgs.pyrex ]; - propagatedBuildInputs = [ pkgs.libyaml ]; - - meta = { - description = "The next generation YAML parser and emitter for Python"; - homepage = http://pyyaml.org; - license = "free"; # !? - }; - }); - - setuptoolsDarcs = b.buildPythonPackage { - name = "setuptools-darcs-1.2.8"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/s/setuptools_darcs/setuptools_darcs-1.2.8.tar.gz"; - sha256 = "0jg9q9mhsky444mm7lpmmlxai8hmjg4pc71viv4kni8gls0gk9n8"; - }; - - propagatedBuildInputs = [ pkgs.darcs ]; - - meta = { - description = "setuptools plugin for the Darcs version control system"; - - homepage = http://allmydata.org/trac/setuptools_darcs; - - license = "BSD"; - }; - }; - - setuptoolsTrial = b.buildPythonPackage { - name = "setuptools-trial-0.5.3"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/s/setuptools_trial/setuptools_trial-0.5.3.tar.gz"; - sha256 = "0h3mgjsz3z1sjl9j0b6bv4bss8d0przamj4gnjmpyazc633hhlyi"; - }; - - propagatedBuildInputs = [ b.twisted ]; - - meta = { - description = "setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)"; - - homepage = http://allmydata.org/trac/setuptools_trial; - - license = "unspecified"; # ! - }; - }; - - simplejson = b.buildPythonPackage (rec { - name = "simplejson-2.0.9"; - - src = fetchsvn { - url = "http://simplejson.googlecode.com/svn/tags/${name}"; - sha256 = "a48d5256fdb4f258c33da3dda110ecf3c786f086dcb08a01309acde6d1ddb921"; - rev = "172"; # to be on the safe side - }; - - meta = { - description = "simplejson is a simple, fast, extensible JSON encoder/decoder for Python"; - - longDescription = '' - simplejson is compatible with Python 2.4 and later with no - external dependencies. It covers the full JSON specification - for both encoding and decoding, with unicode support. By - default, encoding is done in an encoding neutral fashion (plain - ASCII with \uXXXX escapes for unicode characters). - ''; - - homepage = http://code.google.com/p/simplejson/; - - license = "MIT"; - }; - }); - - trac = b.buildPythonPackage { - name = "trac-0.11.5"; - - src = fetchurl { - url = http://ftp.edgewall.com/pub/trac/Trac-0.11.5.tar.gz; - sha256 = "cc3362ecc533abc1755dd78e2d096d1413bc975abc3185318f4821458cd6a8ac"; - }; - - doCheck = false; - - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - - propagatedBuildInputs = [ b.genshi b.setuptools ]; - - meta = { - description = "Enhanced wiki and issue tracking system for software development projects"; - - license = "BSD"; - }; - }; - - twisted = b.buildPythonPackage { - name = "twisted-8.2.0"; - - src = fetchurl { - url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.2/Twisted-8.2.0.tar.bz2; - sha256 = "1c6zplisjdnjzkfs0ld3a0f7m7xbjgx5rcwsdw5i1xiibsq2nq70"; - }; - - propagatedBuildInputs = [ b.zopeInterface ]; - - # Generate Twisted's plug-in cache. Twited users must do it as well. See - # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 - # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for - # details. - postInstall = "$out/bin/twistd --help > /dev/null"; - - meta = { - homepage = http://twistedmatrix.com/; - - description = "Twisted, an event-driven networking engine written in Python"; - - longDescription = '' - Twisted is an event-driven networking engine written in Python - and licensed under the MIT license. - ''; - - license = "MIT"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; - }; - }; - - zbase32 = b.buildPythonPackage (rec { - name = "zbase32-1.1.1"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zbase32/${name}.tar.gz"; - sha256 = "0n59l4rs26vrhxpsfrwybjjir68aj23f09k1yjnbxqy5n0khp8gm"; - }; - - # Tests require `pyutil' so disable them to avoid circular references. - doCheck = false; - - buildInputs = [ b.setuptoolsDarcs ]; - - meta = { - description = "zbase32, a base32 encoder/decoder"; - - homepage = http://pypi.python.org/pypi/zbase32; - - license = "BSD"; - }; - }); - - zfec = b.buildPythonPackage (rec { - name = "zfec-1.4.4"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zfec/${name}.tar.gz"; - sha256 = "0rgg7nsvbr4f9xmiclzypc39fnivg23kldv5aa8si0bgsxn6mh6w"; - }; - - buildInputs = [ b.setuptoolsDarcs ]; - propagatedBuildInputs = [ b.pyutil b.argparse ]; - - meta = { - homepage = http://allmydata.org/trac/zfec; - - description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; - - longDescription = '' - Fast, portable, programmable erasure coding a.k.a. "forward - error correction": the generation of redundant blocks of - information such that if some blocks are lost then the - original data can be recovered from the remaining blocks. The - zfec package includes command-line tools, C API, Python API, - and Haskell API. - ''; - - license = "GPLv2+"; - }; - }); - - xmpppy = builderDefsPackage (import ./xmpppy) { - inherit python; - inherit (b) setuptools; - }; - - zopeInterface = b.buildPythonPackage { - name = "zope-interface-3.3.0"; - src = fetchurl { - url = http://www.zope.org/Products/ZopeInterface/3.3.0/zope.interface-3.3.0.tar.gz; - sha256 = "0xahg9cmagn4j3dbifvgzbjliw2jdrbf27fhqwkdp8j80xpyyjf0"; - }; - - meta = { - description = "Zope.Interface"; - homepage = http://zope.org/Products/ZopeInterface; - license = "ZPL"; - }; - }; - - }; - -}.result diff --git a/pkgs/development/python2-packages/pyopengl/default.nix b/pkgs/development/python2-packages/pyopengl/default.nix deleted file mode 100644 index 60746c34a82..00000000000 --- a/pkgs/development/python2-packages/pyopengl/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ fetchurl, stdenv, python, mesa, freeglut, pil, buildPythonPackage }: - -let version = "3.0.0b5"; -in - buildPythonPackage { - name = "pyopengl-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/pyopengl/PyOpenGL-${version}.tar.gz"; - sha256 = "1rjpl2qdcqn4wamkik840mywdycd39q8dn3wqfaiv35jdsbifxx3"; - }; - - propagatedBuildInputs = [ mesa freeglut pil ]; - - meta = { - homepage = http://pyopengl.sourceforge.net/; - description = "PyOpenGL, the Python OpenGL bindings"; - - longDescription = '' - PyOpenGL is the cross platform Python binding to OpenGL and - related APIs. The binding is created using the standard (in - Python 2.5) ctypes library, and is provided under an extremely - liberal BSD-style Open-Source license. - ''; - - license = "BSD-style"; - }; - } diff --git a/pkgs/development/python2-packages/pyqt/4.5.nix b/pkgs/development/python2-packages/pyqt/4.5.nix deleted file mode 100644 index 4357a4c0ed0..00000000000 --- a/pkgs/development/python2-packages/pyqt/4.5.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, fetchurl, python, sip, qt4}: - -stdenv.mkDerivation { - name = "pyqt-x11-gpl-4.5.4"; - - src = fetchurl { - url = http://pyqwt.sourceforge.net/support/PyQt-x11-gpl-4.5.4.tar.gz; # Not downloading from riverbank, since they remove older releases - sha256 = "1a55zng6yhnbk5swc02bkbyccdgf0f0v94yxk9v5a43hv9xnrl5k"; - }; - - configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins"; - - buildInputs = [ python sip qt4 ]; - - meta = { - description = "Python bindings for Qt"; - license = "GPL"; - homepage = http://www.riverbankcomputing.co.uk; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/python2-packages/python-sip/default.nix b/pkgs/development/python2-packages/python-sip/default.nix deleted file mode 100644 index 3fb827e4600..00000000000 --- a/pkgs/development/python2-packages/python-sip/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, python }: - -stdenv.mkDerivation { - name = "sip-4.8.2"; - - src = fetchurl { - url = http://pyqwt.sourceforge.net/support/sip-4.8.2.tar.gz; # Not downloading from riverbank, since they remove older releases - sha256 = "1afr2qaibzgf8fq4fmc31jz9hvbwxbg5jvl68ygvkkdvnbg2kfrf"; - }; - - configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include"; - - buildInputs = [ python ]; - - meta = { - description = "Creates C++ bindings for Python modules"; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.sander ]; - }; -} diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index 4d04bf6ff3c..c4cd2670e89 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, subversion, fuse, apr, perl }: - +args: with args; stdenv.mkDerivation { name = "svnfs"; @@ -23,7 +22,7 @@ stdenv.mkDerivation { description = "SvnFs is a filesystem written using FUSE for accessing Subversion repositories"; homepage = http://www.jmadden.eu/index.php/svnfs/; license = "GPLv2"; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + maintainers = [args.lib.maintainers.marcweber]; + platforms = args.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdaf9aaa8c5..2be34a33b77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1234,10 +1234,10 @@ let # I did not find any better way of reusing buildPythonPackage+setuptools # for a python with openssl support buildPythonPackage = assert pythonFull.opensslSupport; - import ../development/python2-packages/generic { + import ../development/python-modules/generic { inherit makeWrapper lib; python = pythonFull; - setuptools = builderDefsPackage (import ../development/python2-packages/setuptools) { + setuptools = builderDefsPackage (import ../development/python-modules/setuptools) { inherit makeWrapper; python = pythonFull; }; @@ -1423,6 +1423,24 @@ let inherit fetchurl stdenv python emacs; }; + pystringtemplate = import ../development/python-modules/stringtemplate { + inherit stdenv fetchurl python antlr; + }; + + pythonDBus = builderDefsPackage (import ../development/python-modules/dbus) { + inherit python pkgconfig dbus_glib; + dbus = dbus.libs; + }; + + pythonIRClib = builderDefsPackage (import ../development/python-modules/irclib) { + inherit python; + }; + + pythonSexy = builderDefsPackage (import ../development/python-modules/libsexy) { + inherit python libsexy pkgconfig libxml2 pygtk; + inherit (gtkLibs) pango gtk glib; + }; + openmpi = import ../development/libraries/openmpi { inherit fetchurl stdenv; }; @@ -1844,6 +1862,10 @@ let inherit fetchurl perl perlPackages; }; + xmpppy = builderDefsPackage (import ../development/python-modules/xmpppy) { + inherit python setuptools; + }; + xpf = import ../tools/text/xml/xpf { inherit fetchurl stdenv python; libxml2 = libxml2Python; @@ -2642,6 +2664,16 @@ let inherit stdenv fetchurl; }; + python = if getConfig ["python" "full"] false then pythonFull else pythonBase; + python25 = if getConfig ["python" "full"] false then python25Full else python25Base; + python26 = if getConfig ["python" "full"] false then python26Full else python26Base; + pythonBase = python26Base; + pythonFull = python26Full; + + python24 = import ../development/interpreters/python/2.4 { + inherit fetchurl stdenv zlib bzip2; + }; + python25Base = composedArgsAndFun (import ../development/interpreters/python/2.5) { inherit fetchurl stdenv zlib bzip2 gdbm; }; @@ -2676,19 +2708,6 @@ let xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null; }; - - python31Base = composedArgsAndFun (import ../development/interpreters/python/3.1) { - inherit fetchurl stdenv zlib bzip2 gdbm; - arch = if stdenv.isDarwin then darwinArchUtility else null; - sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null; - }; - - python = if getConfig ["python" "full"] false then pythonFull else pythonBase; - python25 = if getConfig ["python" "full"] false then python25Full else python25Base; - python26 = if getConfig ["python" "full"] false then python26Full else python26Base; - pythonBase = python26Base; - pythonFull = python26Full; - # new python and lib proposal # - adding a python lib to buildinputs should be enough # (handles .pth files by patching site.py @@ -2699,6 +2718,12 @@ let python25New = recurseIntoAttrs ((import ../development/interpreters/python-new/2.5) pkgs); pythonNew = python25New; # the default python + python31Base = composedArgsAndFun (import ../development/interpreters/python/3.1) { + inherit fetchurl stdenv zlib bzip2 gdbm; + arch = if stdenv.isDarwin then darwinArchUtility else null; + sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null; + }; + pyrex = pyrex095; pyrex095 = import ../development/interpreters/pyrex/0.9.5.nix { @@ -5278,50 +5303,142 @@ let ### DEVELOPMENT / PYTHON MODULES - python25Packages = recurseIntoAttrs( import ../development/python2-packages { - inherit pkgs makeWrapper; - python = python25; - }); + buildPythonPackage = + import ../development/python-modules/generic { + inherit python setuptools makeWrapper lib; + }; - python26Packages = recurseIntoAttrs( import ../development/python2-packages { - inherit pkgs makeWrapper; - python = python26; - }); + buildPython26Package = + import ../development/python-modules/generic { + inherit makeWrapper lib; + python = python26; + setuptools = setuptools_python26; + }; pythonPackages = python26Packages; - buildPythonPackage = pythonPackages.buildPythonPackage; - # global python library aliases: - pycrypto = pythonPackages.pycrypto; - twisted = pythonPackages.twisted; - pygtk = pythonPackages.pygtk; - pygobject = pythonPackages.pygobject; - pycairo = pythonPackages.pycairo; - pyGtkGlade = pythonPackages.pyGtkGlade; - pythonDBus = pythonPackages.pythonDBus; - setuptools = pythonPackages.setuptools; - pil = pythonPackages.pil; - pythonIRClib = pythonPackages.pythonIRClib; - pyxml = pythonPackages.pyxml; - pyopengl = pythonPackages.pyopengl; - pygame = pythonPackages.pygame; - flup = pythonPackages.flup; - numeric = pythonPackages.numeric; - pyqt4 = pythonPackages.pyqt4; - sip410 = pythonPackages.sip410; - pyopenssl = pythonPackages.pyopenssl; - pythonSexy = pythonPackages.pythonSexy; + python25Packages = recurseIntoAttrs (import ./python-packages.nix { + inherit pkgs python buildPythonPackage; + }); + + python26Packages = recurseIntoAttrs (import ./python-packages.nix { + inherit pkgs; + python = python26; + buildPythonPackage = buildPython26Package; + }); + + foursuite = import ../development/python-modules/4suite { + inherit fetchurl stdenv python; + }; + + bsddb3 = import ../development/python-modules/bsddb3 { + inherit fetchurl stdenv python db4; + }; + + flup = builderDefsPackage ../development/python-modules/flup { + inherit fetchurl stdenv; + python = python25; + setuptools = setuptools.passthru.function {python = python25;}; + }; + + numeric = import ../development/python-modules/numeric { + inherit fetchurl stdenv python; + }; + + pil = import ../development/python-modules/pil { + inherit fetchurl stdenv python zlib libjpeg freetype; + }; + + psyco = import ../development/python-modules/psyco { + inherit fetchurl stdenv python; + }; + + pycairo = import ../development/python-modules/pycairo { + inherit fetchurl stdenv python pkgconfig cairo x11; + }; + + pycrypto = import ../development/python-modules/pycrypto { + inherit fetchurl stdenv python gmp; + }; + + pycups = import ../development/python-modules/pycups { + inherit stdenv fetchurl python cups; + }; + + pygame = import ../development/python-modules/pygame { + inherit fetchurl stdenv python pkgconfig SDL SDL_image + SDL_mixer SDL_ttf numeric; + }; + + pygobject = import ../development/python-modules/pygobject { + inherit fetchurl stdenv python pkgconfig glib; + }; + + pygtk = import ../development/python-modules/pygtk { + inherit fetchurl stdenv python pkgconfig pygobject pycairo; + inherit (gtkLibs) glib gtk; + }; + + pyGtkGlade = import ../development/python-modules/pygtk { + inherit fetchurl stdenv python pkgconfig pygobject pycairo; + inherit (gtkLibs) glib gtk; + inherit (gnome) libglade; + }; + + pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) { + inherit python openssl; + }; + + rhpl = import ../development/python-modules/rhpl { + inherit stdenv fetchurl rpm cpio python wirelesstools gettext; + }; + + sip = import ../development/python-modules/python-sip { + inherit stdenv fetchurl python; + }; + + pyqt4 = import ../development/python-modules/pyqt { + inherit stdenv fetchurl python qt4 sip; + }; + + pyx = import ../development/python-modules/pyx { + inherit fetchurl stdenv python makeWrapper; + }; + + pyxml = import ../development/python-modules/pyxml { + inherit fetchurl stdenv python makeWrapper; + }; + + setuptools = builderDefsPackage (import ../development/python-modules/setuptools) { + inherit python makeWrapper; + }; + + setuptools_python26 = builderDefsPackage (import ../development/python-modules/setuptools) { + inherit makeWrapper; + python = python26; + }; + wxPython = wxPython26; - sip = pythonPackages.sip; - xmpppy = pythonPackages.xmpppy; - pycups = pythonPackages.pycups; - rhpl = pythonPackages.rhpl; - nevow = pythonPackages.nevow; - # 2.6 aliases - wxPython26 = python26Packages.wxPython; - pil_python26 = python26Packages.pil; - + wxPython26 = import ../development/python-modules/wxPython/2.6.nix { + inherit fetchurl stdenv pkgconfig python; + wxGTK = wxGTK26; + }; + + wxPython28 = import ../development/python-modules/wxPython/2.8.nix { + inherit fetchurl stdenv pkgconfig python; + inherit wxGTK; + }; + + twisted = pythonPackages.twisted; + + ZopeInterface = pythonPackages.zopeInterface; + + zope = import ../development/python-modules/zope { + inherit fetchurl stdenv; + python = python24; + }; + ### SERVERS diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix new file mode 100644 index 00000000000..16a6544f3ff --- /dev/null +++ b/pkgs/top-level/python-packages.nix @@ -0,0 +1,785 @@ +{ pkgs, python, buildPythonPackage }: + +rec { + inherit (pkgs) fetchurl fetchsvn stdenv; + + argparse = buildPythonPackage (rec { + name = "argparse-0.9.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/argparse/${name}.zip"; + sha256 = "00jw32wwccpf9smraywjk869b93w7f99rw8gi63yfhw6379fnq6m"; + }; + + buildInputs = [ pkgs.unzip ]; + + # How do we run the tests? + doCheck = false; + + meta = { + homepage = http://code.google.com/p/argparse/; + + license = "Apache License 2.0"; + + description = "argparse: Python command line parser"; + + longDescription = '' + The argparse module makes writing command line tools in Python + easy. Just briefly describe your command line interface and + argparse will take care of the rest, including: parsing the + arguments and flags from sys.argv, converting arg strings into + objects for your program, formatting and printing any help + messages, and much more. + ''; + }; + }); + + beautifulsoap = buildPythonPackage (rec { + name = "beautifulsoap-3.0.8"; + + src = fetchurl { + url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.0.8.tar.gz"; + sha256 = "1gasiy5lwbhsxw27g36d88n36xbj52434klisvqhljgckd4xqcy7"; + }; + + # No tests implemented + doCheck = false; + + meta = { + homepage = http://www.crummy.com/software/BeautifulSoup/; + + license = "bsd"; + + description = "Undemanding HTML/XML parser"; + }; + }); + + boto = buildPythonPackage (rec { + name = "boto-1.9b"; + + src = fetchurl { + url = "http://boto.googlecode.com/files/${name}.tar.gz"; + sha256 = "0kir3ddm79rxdf7wb5czmxpbnqzgj3j966q4mach29kkb98p48wz"; + }; + + meta = { + homepage = http://code.google.com/p/boto/; + + license = "bsd"; + + description = "Python interface to Amazon Web Services"; + + longDescription = '' + The boto module is an integrated interface to current and + future infrastructural services offered by Amazon Web + Services. This includes S3, SQS, EC2, among others. + ''; + }; + }); + + clientform = buildPythonPackage (rec { + name = "clientform-0.2.10"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/C/ClientForm/ClientForm-0.2.10.tar.gz"; + sha256 = "0dydh3i1sx7rrj6d0gj375wkjpiivm7jjlsimw6hmwv4ck7yf1wm"; + }; + + meta = { + homepage = http://wwwsearch.sourceforge.net/ClientForm/; + + license = "bsd"; + + description = "Python module for handling HTML forms on the client side"; + }; + }); + + cssutils = buildPythonPackage (rec { + name = "cssutils-0.9.7a2"; + + src = fetchurl { + url = http://cssutils.googlecode.com/files/cssutils-0.9.7a2.zip; + sha256 = "068p14qhhczpjgn0w7v57a2swj0g4rndhimh8gkg9h9sd7rp6n07"; + }; + + buildInputs = [ pkgs.unzip ]; + + # The tests fail - I don't know why + doCheck = false; + + meta = { + description = "A Python package to parse and build CSS"; + + homepage = http://code.google.com/p/cssutils/; + + license = "LGPLv3+"; + }; + }); + + darcsver = buildPythonPackage (rec { + name = "darcsver-1.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz"; + sha256 = "1a5cl2yhnd88a4vkc9r381cbjkcvga87dp9zx5av68857q1nvvvq"; + }; + + # Note: We don't actually need to provide Darcs as a build input. + # Darcsver will DTRT when Darcs isn't available. See news.gmane.org + # http://thread.gmane.org/gmane.comp.file-systems.tahoe.devel/3200 for a + # discussion. + + meta = { + description = "Darcsver, generate a version number from Darcs history"; + + homepage = http://pypi.python.org/pypi/darcsver; + + license = "BSD-style"; + }; + }); + + dateutil = buildPythonPackage (rec { + name = "dateutil-1.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz"; + sha256 = "0mrkh932k8s74h4rpgksvpmwbrrkq8zn78gbgwc22i2vlp31bdkl"; + }; + + meta = { + description = "Powerful extensions to the standard datetime module"; + + homepage = http://pypi.python.org/pypi/python-dateutil; + + license = "BSD-style"; + }; + }); + + foolscap = buildPythonPackage (rec { + name = "foolscap-0.4.2"; + + src = fetchurl { + url = "http://foolscap.lothar.com/releases/${name}.tar.gz"; + sha256 = "14g89kjxxci3ssl9jgvpkyrcq62g361aw8pamlkclk8nnrh4f776"; + }; + + propagatedBuildInputs = [ twisted pkgs.pyopenssl ]; + + # For some reason "python setup.py test" doesn't work with Python 2.6. + doCheck = false; + + meta = { + homepage = http://foolscap.lothar.com/; + + description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model"; + + longDescription = '' + "Foolscap" is the name for the next-generation RPC protocol, + intended to replace Perspective Broker (part of Twisted). + Foolscap is a protocol to implement a distributed + object-capabilities model in Python. + ''; + + # See http://foolscap.lothar.com/trac/browser/LICENSE. + license = "MIT"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = python.meta.platforms; + }; + }); + + genshi = buildPythonPackage { + name = "genshi-0.5.1"; + + src = fetchurl { + url = http://ftp.edgewall.com/pub/genshi/Genshi-0.5.1.tar.bz2; + sha256 = "1g2xw3zvgz59ilv7mrdlnvfl6ph8lwflwd4jr6zwrca2zhj7d8rs"; + }; + + patches = + [ # Fix `make check' (http://bugs.gentoo.org/276299) + (fetchurl { + url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/dev-python/genshi/files/genshi-0.5.1_test_fix.patch?rev=1.1"; + sha256 = "019skkas07lc2kjy5br5jhhf9dqfy4fs389m5f4ws3fc62fklwhk"; + }) + ]; + + buildInputs = [ pkgs.setuptools ]; + + meta = { + description = "Python components for parsing HTML, XML and other textual content"; + + longDescription = '' + Python library that provides an integrated set of + components for parsing, generating, and processing HTML, XML or other + textual content for output generation on the web. + ''; + + license = "BSD"; + }; + }; + + jinja2 = buildPythonPackage { + name = "jinja2-2.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.2.1.tar.gz"; + md5 = "fea849d68891218eb0b21c170f1c32d5"; + }; + + meta = { + homepage = http://jinja.pocoo.org/; + description = "Stand-alone template engine"; + license = "BSD"; + longDescription = '' + Jinja2 is a template engine written in pure Python. It provides a + Django inspired non-XML syntax but supports inline expressions and + an optional sandboxed environment. + ''; + }; + }; + + lxml = buildPythonPackage ( rec { + name = "lxml-2.2.2"; + + src = fetchurl { + url = http://pypi.python.org/packages/source/l/lxml/lxml-2.2.2.tar.gz; + sha256 = "0zjpsy67wcs69qhb06ficl3a5z229hmczpr8h84rkk05vaagj8qv"; + }; + + buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; + + meta = { + description = "Pythonic binding for the libxml2 and libxslt libraries"; + homepage = http://codespeak.net/lxml/index.html; + license = "BSD"; + }; + }); + + matplotlib = buildPythonPackage ( rec { + name = "matplotlib-0.99.1.2"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/matplotlib/${name}.tar.gz"; + sha256 = "12lhwgkahck795946hb8wp605c912zq9ds8067ybbifqs56q24b9"; + }; + + doCheck = false; + + buildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ]; + + meta = { + description = "python plotting library, making publication quality plots"; + homepage = "http://matplotlib.sourceforge.net/"; + }; + }); + + mechanize = buildPythonPackage (rec { + name = "mechanize-0.1.11"; + + src = fetchurl { + url = "http://wwwsearch.sourceforge.net/mechanize/src/${name}.tar.gz"; + sha256 = "1h62mwy4iz09jqz17nrb9j8y0djd500zdfqwrz9xmdwqzqwixkj2"; + }; + + propagatedBuildInputs = [ clientform ]; + + meta = { + description = "Stateful programmatic web browsing in Python"; + + homepage = http://wwwsearch.sourceforge.net/; + + license = "BSD-style"; + }; + }); + + namebench = buildPythonPackage (rec { + name = "namebench-1.0.5"; + + src = fetchurl { + url = "http://namebench.googlecode.com/files/${name}.tgz"; + sha256 = "6cbde35ce94d1f31e7d48f5d8eec13238b4dbc505675a33f1e183e600c1482c3"; + }; + + # No support of GUI yet. + + doCheck = false; + + meta = { + homepage = http://namebench.googlecode.com/; + description = "Find fastest DNS servers available"; + license = [ + "Apache-2.0" + # third-party program licenses (embedded in the sources) + "LGPL" # Crystal_Clear + "free" # dns + "Apache-2.0" # graphy + "BSD" # jinja2 + ]; + longDescription = '' + It hunts down the fastest DNS servers available for your computer to + use. namebench runs a fair and thorough benchmark using your web + browser history, tcpdump output, or standardized datasets in order + to provide an individualized recommendation. namebench is completely + free and does not modify your system in any way. + ''; + }; + }); + + nevow = buildPythonPackage (rec { + name = "nevow-0.9.33"; + + src = fetchurl { + url = "http://divmod.org/trac/attachment/wiki/SoftwareReleases/Nevow-0.9.33.tar.gz?format=raw"; + sha256 = "1b6zhfxx247b60n1qi2hrawhiaah88v8igg37pf7rjkmvy2z1c6c"; + name = "${name}.tar.gz"; + }; + + propagatedBuildInputs = [ twisted ]; + + postInstall = "twistd --help > /dev/null"; + + meta = { + description = "Nevow, a web application construction kit for Python"; + + longDescription = '' + Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow + is a web application construction kit written in Python. It is + designed to allow the programmer to express as much of the view + logic as desired in Python, and includes a pure Python XML + expression syntax named stan to facilitate this. However it + also provides rich support for designer-edited templates, using + a very small XML attribute language to provide bi-directional + template manipulation capability. + + Nevow also includes formless, a declarative syntax for + specifying the types of method parameters and exposing these + methods to the web. Forms can be rendered automatically, and + form posts will be validated and input coerced, rendering error + pages if appropriate. Once a form post has validated + successfully, the method will be called with the coerced values. + ''; + + homepage = http://divmod.org/trac/wiki/DivmodNevow; + + license = "BSD-style"; + }; + }); + + numpy = buildPythonPackage ( rec { + name = "numpy-1.3.0"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/numpy/${name}.tar.gz"; + sha256 = "7524687cce85aa78103046db5e617c626b0ef871a203a049159f88f35647c90d"; + }; + + doCheck = false; + + buildInputs = [ pkgs.liblapack pkgs.blas /* pkgs.gfortran */ ]; + + # The build should be run as follows: + # + # python setup.py config_fc --fcompiler=gnu95 build + # python setup.py config_fc --fcompiler=gnu95 install + # + # But I con't figure out how to pass the extra flags to setuptools. + + meta = { + description = "Scientific tools for Python"; + homepage = "http://numpy.scipy.org/"; + }; + }); + + ply = buildPythonPackage (rec { + name = "ply-3.2"; + + src = fetchurl { + url = "http://www.dabeaz.com/ply/${name}.tar.gz"; + sha256 = "10z4xq8lc8c21v4g7z3zpnvpqbc0vidigrck1kqhwgkqi4gh0kfj"; + }; + + meta = { + homepage = http://www.dabeaz.com/ply/; + + description = "PLY (Python Lex-Yacc), an implementation of the lex and yacc parsing tools for Python"; + + longDescription = '' + PLY is an implementation of lex and yacc parsing tools for Python. + In a nutshell, PLY is nothing more than a straightforward lex/yacc + implementation. Here is a list of its essential features: It's + implemented entirely in Python; It uses LR-parsing which is + reasonably efficient and well suited for larger grammars; PLY + provides most of the standard lex/yacc features including support for + empty productions, precedence rules, error recovery, and support for + ambiguous grammars; PLY is straightforward to use and provides very + extensive error checking; PLY doesn't try to do anything more or less + than provide the basic lex/yacc functionality. In other words, it's + not a large parsing framework or a component of some larger system. + ''; + + license = "revised-BSD"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = python.meta.platforms; + }; + }); + + psycopg2 = buildPythonPackage rec { + name = "psycopg2-2.0.13"; + + doCheck = false; + + src = fetchurl { + url = "http://initd.org/pub/software/psycopg/PSYCOPG-2-0/${name}.tar.gz"; + sha256 = "0arkaa1nbbd3pyn4l1bc75wi7nff3vxxh4s8sj5al5hv20p64pm1"; + }; + + propagatedBuildInputs = [ pkgs.postgresql ]; + + meta = { + description = "PostgreSQL database adapter for the Python programming language"; + license = "GPLv2/ZPL"; + }; + }; + + pycryptopp = buildPythonPackage (rec { + name = "pycryptopp-0.5.15"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz"; + sha256 = "0f8v3cs8vjpj423yx3ikj7qjvljrm86x0qpkckidv69kah8kndxa"; + }; + + # Use our own copy of Crypto++. + preConfigure = "export PYCRYPTOPP_DISABLE_EMBEDDED_CRYPTOPP=1"; + + buildInputs = [ setuptoolsDarcs darcsver pkgs.cryptopp ]; + + meta = { + homepage = http://allmydata.org/trac/pycryptopp; + + description = "Python wrappers for the Crypto++ library"; + + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.linux; + }; + }); + + pyopengl = + let version = "3.0.0b5"; + in + buildPythonPackage { + name = "pyopengl-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/pyopengl/PyOpenGL-${version}.tar.gz"; + sha256 = "1rjpl2qdcqn4wamkik840mywdycd39q8dn3wqfaiv35jdsbifxx3"; + }; + + propagatedBuildInputs = with pkgs; [ mesa freeglut pil ]; + + meta = { + homepage = http://pyopengl.sourceforge.net/; + description = "PyOpenGL, the Python OpenGL bindings"; + + longDescription = '' + PyOpenGL is the cross platform Python binding to OpenGL and + related APIs. The binding is created using the standard (in + Python 2.5) ctypes library, and is provided under an extremely + liberal BSD-style Open-Source license. + ''; + + license = "BSD-style"; + }; + }; + + pysqlite = buildPythonPackage (rec { + name = "pysqlite-2.5.5"; + + src = fetchurl { + url = "http://pysqlite.googlecode.com/files/${name}.tar.gz"; + sha256 = "ef7ca7f44893790e1a7084b10ea083770e138689406fddc7076d12d6bff4d44f"; + }; + + # Since the `.egg' file is zipped, the `NEEDED' of the `.so' files + # it contains is not taken into account. Thus, we must explicitly make + # it a propagated input. + propagatedBuildInputs = [ pkgs.sqlite ]; + + patchPhase = '' + substituteInPlace "setup.cfg" \ + --replace "/usr/local/include" "${pkgs.sqlite}/include" \ + --replace "/usr/local/lib" "${pkgs.sqlite}/lib" + ''; + + # FIXME: How do we run the tests? + doCheck = false; + + meta = { + homepage = http://pysqlite.org/; + + description = "Python bindings for the SQLite embedded relational database engine"; + + longDescription = '' + pysqlite is a DB-API 2.0-compliant database interface for SQLite. + + SQLite is a relational database management system contained in + a relatively small C library. It is a public domain project + created by D. Richard Hipp. Unlike the usual client-server + paradigm, the SQLite engine is not a standalone process with + which the program communicates, but is linked in and thus + becomes an integral part of the program. The library + implements most of SQL-92 standard, including transactions, + triggers and most of complex queries. + + pysqlite makes this powerful embedded SQL engine available to + Python programmers. It stays compatible with the Python + database API specification 2.0 as much as possible, but also + exposes most of SQLite's native API, so that it is for example + possible to create user-defined SQL functions and aggregates + in Python. + ''; + + license = "revised BSD"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = python.meta.platforms; + }; + }); + + pyutil = buildPythonPackage (rec { + name = "pyutil-1.3.30"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyutil/${name}.tar.gz"; + sha256 = "1ksb4gn8x53wcyddmjv1ma8cvvhjlmfxc6kpszyhb838i7xzla19"; + }; + + buildInputs = [ setuptoolsDarcs ]; + propagatedBuildInputs = [ zbase32 argparse ]; + + meta = { + description = "Pyutil, a collection of mature utilities for Python programmers"; + + longDescription = '' + These are a few data structures, classes and functions which + we've needed over many years of Python programming and which + seem to be of general use to other Python programmers. Many of + the modules that have existed in pyutil over the years have + subsequently been obsoleted by new features added to the + Python language or its standard library, thus showing that + we're not alone in wanting tools like these. + ''; + + homepage = http://allmydata.org/trac/pyutil; + + license = "GPLv2+"; + }; + }); + + pyyaml = buildPythonPackage (rec { + name = "PyYAML-3.09"; + + src = fetchurl { + url = "http://pyyaml.org/download/pyyaml/PyYAML-3.09.zip"; + sha256 = "204aca8b42dbe90e460794d743dd16182011da85507bfd4f092f9f76e0688040"; + }; + + buildInputs = [ pkgs.unzip pkgs.pyrex ]; + propagatedBuildInputs = [ pkgs.libyaml ]; + + meta = { + description = "The next generation YAML parser and emitter for Python"; + homepage = http://pyyaml.org; + license = "free"; # !? + }; + }); + + setuptoolsDarcs = buildPythonPackage { + name = "setuptools-darcs-1.2.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/setuptools_darcs/setuptools_darcs-1.2.8.tar.gz"; + sha256 = "0jg9q9mhsky444mm7lpmmlxai8hmjg4pc71viv4kni8gls0gk9n8"; + }; + + propagatedBuildInputs = [ pkgs.darcs ]; + + meta = { + description = "setuptools plugin for the Darcs version control system"; + + homepage = http://allmydata.org/trac/setuptools_darcs; + + license = "BSD"; + }; + }; + + setuptoolsTrial = buildPythonPackage { + name = "setuptools-trial-0.5.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/setuptools_trial/setuptools_trial-0.5.3.tar.gz"; + sha256 = "0h3mgjsz3z1sjl9j0b6bv4bss8d0przamj4gnjmpyazc633hhlyi"; + }; + + propagatedBuildInputs = [ twisted ]; + + meta = { + description = "setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)"; + + homepage = http://allmydata.org/trac/setuptools_trial; + + license = "unspecified"; # ! + }; + }; + + simplejson = buildPythonPackage (rec { + name = "simplejson-2.0.9"; + + src = fetchsvn { + url = "http://simplejson.googlecode.com/svn/tags/${name}"; + sha256 = "a48d5256fdb4f258c33da3dda110ecf3c786f086dcb08a01309acde6d1ddb921"; + rev = "172"; # to be on the safe side + }; + + meta = { + description = "simplejson is a simple, fast, extensible JSON encoder/decoder for Python"; + + longDescription = '' + simplejson is compatible with Python 2.4 and later with no + external dependencies. It covers the full JSON specification + for both encoding and decoding, with unicode support. By + default, encoding is done in an encoding neutral fashion (plain + ASCII with \uXXXX escapes for unicode characters). + ''; + + homepage = http://code.google.com/p/simplejson/; + + license = "MIT"; + }; + }); + + trac = buildPythonPackage { + name = "trac-0.11.5"; + + src = fetchurl { + url = http://ftp.edgewall.com/pub/trac/Trac-0.11.5.tar.gz; + sha256 = "cc3362ecc533abc1755dd78e2d096d1413bc975abc3185318f4821458cd6a8ac"; + }; + + doCheck = false; + + PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; + + propagatedBuildInputs = [ genshi pkgs.setuptools ]; + + meta = { + description = "Enhanced wiki and issue tracking system for software development projects"; + + license = "BSD"; + }; + }; + + twisted = buildPythonPackage { + name = "twisted-8.2.0"; + + src = fetchurl { + url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.2/Twisted-8.2.0.tar.bz2; + sha256 = "1c6zplisjdnjzkfs0ld3a0f7m7xbjgx5rcwsdw5i1xiibsq2nq70"; + }; + + propagatedBuildInputs = [ zopeInterface ]; + + # Generate Twisted's plug-in cache. Twited users must do it as well. See + # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 + # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for + # details. + postInstall = "$out/bin/twistd --help > /dev/null"; + + meta = { + homepage = http://twistedmatrix.com/; + + description = "Twisted, an event-driven networking engine written in Python"; + + longDescription = '' + Twisted is an event-driven networking engine written in Python + and licensed under the MIT license. + ''; + + license = "MIT"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = python.meta.platforms; + }; + }; + + zbase32 = buildPythonPackage (rec { + name = "zbase32-1.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zbase32/${name}.tar.gz"; + sha256 = "0n59l4rs26vrhxpsfrwybjjir68aj23f09k1yjnbxqy5n0khp8gm"; + }; + + # Tests require `pyutil' so disable them to avoid circular references. + doCheck = false; + + buildInputs = [ setuptoolsDarcs ]; + + meta = { + description = "zbase32, a base32 encoder/decoder"; + + homepage = http://pypi.python.org/pypi/zbase32; + + license = "BSD"; + }; + }); + + zfec = buildPythonPackage (rec { + name = "zfec-1.4.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zfec/${name}.tar.gz"; + sha256 = "0rgg7nsvbr4f9xmiclzypc39fnivg23kldv5aa8si0bgsxn6mh6w"; + }; + + buildInputs = [ setuptoolsDarcs ]; + propagatedBuildInputs = [ pyutil argparse ]; + + meta = { + homepage = http://allmydata.org/trac/zfec; + + description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; + + longDescription = '' + Fast, portable, programmable erasure coding a.k.a. "forward + error correction": the generation of redundant blocks of + information such that if some blocks are lost then the + original data can be recovered from the remaining blocks. The + zfec package includes command-line tools, C API, Python API, + and Haskell API. + ''; + + license = "GPLv2+"; + }; + }); + + zopeInterface = buildPythonPackage { + name = "zope-interface-3.3.0"; + src = fetchurl { + url = http://www.zope.org/Products/ZopeInterface/3.3.0/zope.interface-3.3.0.tar.gz; + sha256 = "0xahg9cmagn4j3dbifvgzbjliw2jdrbf27fhqwkdp8j80xpyyjf0"; + }; + + doCheck = false; + + meta = { + description = "Zope.Interface"; + homepage = http://zope.org/Products/ZopeInterface; + license = "ZPL"; + }; + }; +} From 741cc2fef8922da4741c0ffd40acf90c468c14ac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Apr 2010 11:11:42 +0000 Subject: [PATCH 293/313] * Cleanup: removed the unused `python-new'. svn path=/nixpkgs/trunk/; revision=21197 --- pkgs/top-level/all-packages.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2be34a33b77..8da577cdf4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2708,16 +2708,6 @@ let xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null; }; - # new python and lib proposal - # - adding a python lib to buildinputs should be enough - # (handles .pth files by patching site.py - # while introducing NIX_PYTHON_SITES describing list of modules) - # - adding pyCheck = "import foo" test scripts to ensure libraries can be imported - # - providing pythonWrapper so that you can run python and import the selected libraries - # feel free to comment on this (experimental) - python25New = recurseIntoAttrs ((import ../development/interpreters/python-new/2.5) pkgs); - pythonNew = python25New; # the default python - python31Base = composedArgsAndFun (import ../development/interpreters/python/3.1) { inherit fetchurl stdenv zlib bzip2 gdbm; arch = if stdenv.isDarwin then darwinArchUtility else null; From f20c7e9c46be5d1da5d135a5d4312427c1d763c5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Apr 2010 11:12:06 +0000 Subject: [PATCH 294/313] * Cleanup: removed the unused `python-new'. svn path=/nixpkgs/trunk/; revision=21198 --- .../interpreters/python-new/2.5/default.nix | 682 ------------------ .../2.5/gentoo-python-2.5-compat.patch | 72 -- .../python-new/2.5/nix-find-sites-2.5.patch | 33 - .../interpreters/python-new/2.5/python.nix | 68 -- .../python-new/2.5/search-path.patch | 28 - 5 files changed, 883 deletions(-) delete mode 100644 pkgs/development/interpreters/python-new/2.5/default.nix delete mode 100644 pkgs/development/interpreters/python-new/2.5/gentoo-python-2.5-compat.patch delete mode 100644 pkgs/development/interpreters/python-new/2.5/nix-find-sites-2.5.patch delete mode 100644 pkgs/development/interpreters/python-new/2.5/python.nix delete mode 100644 pkgs/development/interpreters/python-new/2.5/search-path.patch diff --git a/pkgs/development/interpreters/python-new/2.5/default.nix b/pkgs/development/interpreters/python-new/2.5/default.nix deleted file mode 100644 index d47a063f63b..00000000000 --- a/pkgs/development/interpreters/python-new/2.5/default.nix +++ /dev/null @@ -1,682 +0,0 @@ -# the nix-python way.. - -# By default python looks in the $prefix/lib/python-$version/site-packages directory -# and reads the .pth files to add the library paths to sys.path. -# Using PYHTONPATH is not enough because it doesn't make python read the .pth files -# telling python where to find additional modules. PYTHONUSERBASE would suffice, but -# it only supports *one* user location. That's why I've added the new env var NIX_PYTHON_SITES -# containing a colon separated list of modules telling python where to look -# for imports and also read the .pth files - -# TODO optimize py modules automatically (gentoo has a ebuild function called python_mod_optimize ?) - -p: # p = pkgs -let - inherit (builtins) isAttrs hasAttr; - inherit (p) lib fetchurl stdenv getConfig sourceFromHead; - inherit (p.composableDerivation) composableDerivation; - # withName prevents nix-env -qa \* from aborting (pythonLibStub is a derivation but hasn't a name) - withName = lib.mapAttrs (n : v : if (isAttrs v && (!hasAttr "name" v)) then null else v); -in - withName ( lib.fix ( t : { # t = this attrs - - version = "2.5"; - versionAttr = "python25"; - - # see pythonFull. - pythonMinimal = ( (import ./python.nix) { - name = "python-${t.version}"; - inherit composableDerivation; - inherit (p) fetchurl stdenv lib bzip2 ncurses; - inherit (p) zlib sqlite db4 readline openssl gdbm; - }); - - # python wiht all features enabled. - # if you really need a stripped version we should add __overides - # so that you can replace it the way it's done in all-packages.nix - pythonFull = t.pythonMinimal.merge { - name = "python-${t.version}-full"; - cfg = { - zlibSupport = true; - sqliteSupport = true; - db4Support = true; - readlineSupport = true; - opensslSupport = true; - gdbmSupport = true; - }; - }; - - # python wrapper. You should install this - # It automatically wrapps python adding NIX_PYTHON_SITES so that you can use all the libraries - # when running the wrapper from the console. - # configuration: - # python25 = { wrapperLibs = let p = pkgs.python25New; in [ p.wxPython25 p.name p.name2 ]; }; - # python25 = { wrapperLibs = [ "all" ]; }; # install all libraries provided by this file - # TODO: does pydoc find stuff from libraries? - pythonWrapper = stdenv.mkDerivation { - name = "${t.pythonFull.name}-wrapper"; - # [1] using full because I feel installing various versions isn't any better - phases = "buildPhase"; - buildInputs = [ p.makeWrapper ] - ++ lib.concatMap (x: if x == "all" then t.all else [x]) (getConfig [t.versionAttr "wrapperLibs"] []); - - buildPhase = '' - ensureDir $out/bin - - for prog in python pydoc; do - echo ========= prog $prog - cat >> $out/bin/$prog << EOF - export NIX_PYTHON_SITES=\$NIX_PYTHON_SITES:$NIX_PYTHON_SITES - exec ${t.pythonFull}/bin/$prog "\$@" - EOF - echo chmod +x - chmod +x $out/bin/$prog - done - ''; - }; - - ### basic support for installing python libraries - # set pyCheck to a small python snippet importing all modules of this python - # lib to verify it works - # You can define { python25 { debugCmd = "DISPLAY=:0.0 pathtoxterm"; } - # in your config for easier debugging.. - pythonLibStub = composableDerivation {} { - propagatedBuildInputs = [ t.pythonFull ]; # see [1] - postPhases = ["postAll"]; # using new name so that you dno't override this phase by accident - # ensure phases are run or a non zero exit status is caused (if there are any syntax errors such as eval "while") - postAll = '' - ensureDir $out/nix-support - echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook - # run check - if [ -n "$pyCheck" ]; then - ( . $out/nix-support/setup-hook - mkdir $TMP/new-test; cd $TMP/new-test - echo PYTHONPATH=$PYTHONPATH - echo NIX_PYTHON_SITES=$NIX_PYTHON_SITES - script="$(echo -e "import sys\nprint sys.path\npyCheck\nprint \"check ok\"")" - script="''${script/pyCheck/$pyCheck}" - echo "check script is"; echo "$script" - echo "$script" | python || { ${ getConfig [t.versionAttr "debugCmd"] ":"} ; echo "pycheck failed"; exit 1; } - ) - fi''; - passthru = { - libPython = t.version; # used to find all python libraries fitting this version (-> see name all below) - }; - mergeAttrBy = { - postPhases = lib.concat; - pyCheck = x : y : "${x}\n${y}"; - }; - }; - - # same as pythonLibStub, but runs default python setup.py actions - pythonLibSetup = t.pythonLibStub.merge { - buildPhase = ''python setup.py $setupFlags build''; - installPhase = ''python setup.py $setupFlags install --prefix=$out''; - mergeAttrBy = { - setupFlags = lib.concat; - }; - }; - - ### python libraries: - - wxPythonBaseFun = (t.pythonLibSetup.merge (a : - let inherit (a.fixed.passthru) wxGTK; inherit (a.fixed) version; in - { - buildInputs = [p.pkgconfig wxGTK (wxGTK.gtk)]; - setupFlags=["WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=0 BUILD_OGL=0 UNICODE=1"]; - configurePhase = ''cd wxPython''; - pyCheck = "import wx"; - name = "wxPython-${version}"; - meta = { # 2.6.x and 2.8.x - description="A blending of the wxWindows C++ class library with Python"; - homepage="http://www.wxpython.org/"; - license="wxWinLL-3"; - }; - } - )).merge; - - wxPython26 = t.wxPythonBaseFun { - version = "2.6.3.3"; - passthru = { wxGTK = p.wxGTK26; }; - src = fetchurl { - url = mirror://sourceforge/wxpython/wxPython-src-2.6.3.3.tar.bz2; - md5 = "66b9c5f8e20a9505c39dab1a1234daa9"; - }; - }; - - # compilation errors - #wxPython28 = t.wxPythonBaseFun { - # version = "2.8.9.1"; - # passthru = { wxGTK = wxGTK28; }; - # src = fetchurl { - # url = mirror://sourceforge.net/sourceforge/wxpython/wxPython-src-2.8.9.1.tar.bz2; - # sha256 = "1yp7l2c2lfpwc2x5lk5pawmzq2bqajzhbzqs1p10jd211slwhjsq"; - # }; - #}; - - # couldn't download source - #foursuite = pythonLibSetup.merge { - # version = "1.0.2"; - # name = "4suite-${version}"; - # src = fetchurl { - # url = "mirror://sourceforge/foursuite/4Suite-XML-${version}.tar.bz2"; - # sha256 = "0g5cyqxhhiqnvqk457k8sb97r18pwgx6gff18q5296xd3zf4cias"; - # }; - #}; - - #bsddb3 = t.pythonLibSetup.merge { - # version = "1.0.2"; - # name = "bsddb3-4.5.0"; - # setupFlags = ["--berkeley-db=${p.db4}"]; - # src = fetchurl { - # url = mirror://sourceforge/pybsddb/bsddb3-4.5.0.tar.gz; - # sha256 = "1h09kij32iikr9racp5p7qrb4li2gf2hs0lyq6d312qarja4d45v"; - # }; - #}; - - # pyglib contains import reference to pygtk! So its best to install both at - # the same time. I don't want to patch this. - # You can install both into different store paths, however you won't be able - # to import gtk because after pygtk.require sys.path contains to - # /nix/store/*-pygobject/**/gtk-2.0 (should be pygtk/**/gtk-2.0 instead) - - # gnome python is added here as well because it is loaded after - # pygtk.require('2.0') as well. So the pygtk lib path is added to sys.path only. - # We could make extra derivations for that. But on the other hand that would require - # patching pygtk to another */gtk2.0 directory to sys.path for each NIX_PYTHON_SITES. - # If you install dozens of python packages this might be bloat. - # So I think the overhead of installing these packages into the same store path should be prefered. - pygtkBaseFun = (t.pythonLibStub.merge (a : - let inherit (a.fixed.passthru) glib gtk; in lib.mergeAttrsByFuncDefaults [ - { - unpackPhase = "true"; - configurePhase = "true"; - patchPhase = "true"; - buildPhase = "true"; - installPhase = '' - unset unpackPhase - unset configurePhase - unset buildPhase - unset installPhase - export G2CONF="--enable-gconf" # hack, should be specified somewhere else - for srcs in $pygobjectSrc $pygtkSrc $pySrcs; do - cd $TMP; mkdir "$(basename $srcs)"; cd "$(basename $srcs)"; unpackFile $srcs - cd * - configurePhase; buildPhase; installPhase - addToEnv $out # pygtk has to know about pygobject - PATH=$out/bin:$PATH # gnome-python nees pygtk-codegen - done - ''; - mergeAttrBy = { - phases = lib.concat; - pySrcs = lib.concat; - pyCheck = x : y : "${x}\n${y}"; - }; - } - # pygobject - { - flags = { - libffi = { buildInputs = [p.libffi];}; - }; - cfg = { - libffiSupport = true; - }; - pyCheck = "import gobject"; - passthru = { - pygobjectVersion = "2.15.4"; - }; - pygobjectSrc = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.15/pygobject-2.15.4.tar.bz2"; - sha256 = "19vxczy01xyss2f5aqf93al3jzrxn50srgzkl4w7ivdz50rnjin7"; - }; - buildInputs = [ p.glibc ]; # requires ld-config - - propagatedBuildInputs = [ p.pkgconfig glib gtk ]; - } - # pygtk - { - propagatedBuildInputs = [ t.pycairo ]; - flags = { - cairo = { - propagatedBuildInputs = [ p.cairo ]; - pyCheck = "import cairo"; - }; # TODO add pyCheck - glade = { - propagatedBuildInputs = [ p.gnome.libglade ]; - pyCheck = "from gtk import glade"; - }; - }; - pyCheck = '' - import pygtk; pygtk.require('2.0') - import gtk - import gconf - ''; - cfg = { - gladeSupport = true; - cairoSupport = true; - }; - } - # gnome-python - { - #name = "gnome-python-2.22.3"; - buildInputs = [ p.pkgconfig p.gnome.libgnome ]; - propagatedBuildInputs = [ p.gnome.GConf ]; - pySrcs = [(fetchurl { - url = http://ftp.gnome.org/pub/GNOME/sources/gnome-python/2.22/gnome-python-2.22.3.tar.bz2; - sha256 = "0ndm3cns9381mm6d8jxxfd931fk93nqfcszy38p1bz501bs3wxm1"; - })]; - } - # gnome-desktop or gnome-python-extras desktop containing egg.trayicon needed by istanbul - { - # name = "gnome-desktop-2.24.0"; - buildInputs = [ p.pkgconfig ]; - propagatedBuildInputs = [ p.gnome.GConf ]; - pySrcs = [(fetchurl { - url = http://ftp.gnome.org/pub/GNOME/sources/gnome-python-desktop/2.24/gnome-python-desktop-2.24.0.tar.bz2; - sha256 = "16514gmv42ygjh5ggzsis697m73pgg7ydz11h487932kkzv4mmlg"; - })]; - pyCheck = "import egg.trayicon"; - } - { - # name = "gnome-python-extras-2.13"; - buildInputs = [ p.pkgconfig ]; - propagatedBuildInputs = [ p.gnome.GConf ]; - pySrcs = [(fetchurl { - url = http://ftp.gnome.org/pub/GNOME/sources/gnome-python-extras/2.13/gnome-python-extras-2.13.3.tar.gz; - sha256 = "0vj0289snagrnvbmrs1camwmrc93xgpw650iavj6mq7a3wqcra0b"; - })]; - } - ])); - - #pygtk213 = t.pygtkBaseFun { - # version = "2.13.0"; - # pygtkSrc = fetchurl { - # url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.13/pygtk-2.13.0.tar.bz2; - # sha256 = "0644ll48hi8kwfng37b0k5qgb0fbiy298r7sxd4j7ag7lj4bgic0"; - # }; - # passthru = { inherit (p.gtkLibs) glib gitk; }; - # pyCheck = '' - # import pygtk; pygtk.require('2.0') - # import gtk - # ''; - #}; - - pygtk212 = t.pygtkBaseFun.merge (a : { - version = "2.12.1"; - name = "pygobject-${a.fixed.passthru.pygobjectVersion}-and-pygtk-${a.fixed.version}"; - pygtkSrc = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/sources/pygtk/2.12/pygtk-2.12.1.tar.bz2; - sha256 = "0gg13xgr7y9sppw8bdys042928nc66czn74g60333c4my95ys021"; - }; - passthru = { inherit (p.gtkLibs) glib gtk; }; - pyCheck = '' - import pygtk; pygtk.require('2.0') - import gtk - ''; - }); - - pycairo = t.pythonLibStub.merge { - name = "pycairo-1.8.0"; - buildInputs = [ p.pkgconfig p.cairo p.x11 ]; - src = fetchurl { - url = http://www.cairographics.org/releases/pycairo-1.6.4.tar.gz; - md5 = "2c3aa21e6e610321498f9f81f7b625df"; - }; - pyCheck = "import cairo"; - }; - - gstPython = t.pythonLibStub.merge { - name = "gst-python-0.10.13"; - src = fetchurl { - url = http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.13.tar.gz; - sha256 = "0yin36acr5ryfpmhlb4rlagabgxrjcmbpizwrc8csadmxzmigb86"; - }; - buildInputs =[ p.flex2535 p.pkgconfig]; - flags = { - pluginsGood = { propagatedBuildInputs = [p.gst_all.gstPluginsGood]; }; - ffmpeg = { propagatedBuildInputs = [p.gst_all.gstFfmpeg]; }; - }; - cfg = { - pluginsGoodSupport = true; - ffmpegSupport = true; - }; - propagatedBuildInputs = [ - t.pygtk212 - p.gst_all.gstreamer - p.gst_all.gstPluginsBase - p.gst_all.gnonlin - ]; - # this check fails while building: It succeeds running as normal user - /* - Traceback (most recent call last): - File "", line 5, in - File "/nix/store/hnc51h035phlk68i1qmr5a8kc73dfvhp-gst-python-0.10.13/lib/python2.5/site-packages/gst-0.10/gst/__init__.py", line 170, in - from _gst import * - RuntimeError: can't initialize module gst: Error re-scanning registry , child terminated by signal - */ - pyCheck = '' - #import pygst - #pygst.require('0.10') - #import gst - ''; - meta = { - description = "python gstreamer bindings"; - homepage = http://gstreamer.freedesktop.org/modules/gst-python.html; - license = "GPLv2.1"; - }; - }; - - pygoocanvas = t.pythonLibStub.merge { - src = p.fetchurl { - url = http://download.berlios.de/pygoocanvas/pygoocanvas-0.10.0.tar.gz; - sha256 = "0pxznzdscbhvn8102vrqy3r1g6ss4sgs8wwy6y4c5g26rrp7l55d"; - }; - propagatedBuildInputs = [ t.pygtk212 ]; - buildInputs = [ p.pkgconfig p.goocanvas ]; - pyCheck = "import goocanvas"; - name = "pygoocanvas-0.10.0"; - meta = { - description = ""; - homepage = http://developer.berlios.de/projects/pygoocanvas/; - license = "LGPL"; - }; - }; - - setuptools = t.pythonLibSetup.merge { - name = "setuptools-0.6c9"; - postUnpack = '' - ensureDir $out/lib/python2.5/site-packages - export PYTHONPATH="$out/lib/python${t.version}/site-packages" # shut up installation script - - # setuptools tries to write to the installation location, so ensure it exists - # and it requires PYTHONPATH to be set to that location (maybe its better to patch it. - I'm lazy) - ensureDir $out/nix-support - cat >> $out/nix-support/setup-hook << EOF - ensureDir \$out/lib/python${t.version}/site-packages - export PYTHONPATH="\$out/lib/python${t.version}/site-packages" # shut up installation script - EOF - ''; - src = p.fetchurl { - url = "http://pypi.python.org/packages/source/s/setuptools/setuptools-0.6c9.tar.gz"; - md5 = "3864c01d9c719c8924c455714492295e"; - }; - }; - - zopeInterface = t.pythonLibSetup.merge rec { - version = "3.3.0"; - name = "zope.interface-${version}"; - buildInputs = [ t.setuptools ]; - src = p.fetchurl { - url = "http://www.zope.org/Products/ZopeInterface/3.3.0/zope.interface-${version}.tar.gz"; - sha256 = "0xahg9cmagn4j3dbifvgzbjliw2jdrbf27fhqwkdp8j80xpyyjf0"; - }; - pyCheck = "from zope.interface import Interface, Attribute"; - }; - - dbusPython = t.pythonLibStub.merge rec { - version = "0.83.0"; - name = "dbus-python-0.83.0"; - buildInputs = [ p.pkgconfig ]; - propagatedBuildInputs = [ p.dbus p.dbus_glib ]; - src = fetchurl { - url = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-0.83.0.tar.gz"; - sha256 = "14b1fwq9jyvg9qbbrmpk1264s9shm9n638hsgmkh9fn2lmd1vpc9"; - }; - pyCheck = "import dbus"; - meta = { - description = ""; - homepage = http://freedesktop.org/wiki/Software/DBusBindings; - license = [ "GPLv2" "AFL-2.1" ]; - }; - }; - - pythonXlib = t.pythonLibSetup.merge { - name = "python-xlib-0.14"; - src = fetchurl { - url = http://puzzle.dl.sourceforge.net/sourceforge/python-xlib/python-xlib-0.14.tar.gz; - sha256 = "1sv0447j0rx8cgs3jhjl695p5pv13ihglcjlrrz1kq05lsvb0wa7"; - }; - meta = { - description = "tries to be a fully functional X client library beeing entirely written in python"; - license = [ "GPL" ]; - homepage = http://python-xlib.sourceforge.net/; - }; - }; - - mechanize = t.pythonLibSetup.merge { - name = "mechanize-0.1.11"; - buildInputs = [ t.setuptools ]; - src = fetchurl { - url = http://wwwsearch.sourceforge.net/mechanize/src/mechanize-0.1.11.tar.gz; - sha256 = "1h62mwy4iz09jqz17nrb9j8y0djd500zdfqwrz9xmdwqzqwixkj2"; - }; - meta = { - description = "Stateful programmatic web browsing in Python, after Andy Lester's Perl module WWW::Mechanize"; - homepage = http://wwwsearch.sourceforge.net/mechanize/; - license = ["BSD" "ZPL 2.1"]; - }; - pyCheck = "from mechanize import Browser"; - }; - - pexpect = t.pythonLibSetup.merge { - name = "pexpect-2.3"; - src = fetchurl { - url = mirror://sourceforge/pexpect/pexpect-2.3.tar.gz; - sha256 = "0x8bfjjqygriry1iyygm5048ykl5qpbpzqfp6i8dhkslm3ryf5fk"; - }; - meta = { - description = "tcl expect as python library"; - homepage = http://www.noah.org/wiki/Pexpect; - license = "MIT"; - }; - }; - - # unmantained ? (gentoo/ debian even do have python-3* patches) - pyxml = t.pythonLibSetup.merge { - name = "pyxml-0.8.4"; - src = fetchurl { - url = mirror://sourceforge/pyxml/PyXML-0.8.4.tar.gz; - sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz"; - }; - meta = { - description = "python xml package"; - homepage = http://sourceforge.net/projects/pyxml/; - license = "Python License"; # (CNRI Python License); - }; - }; - - /* - # untested - libxml2dom = t.pythonLibSetup.merge { - name = "libxml2dom-0.4.7"; - buildInputs = [ p.libxml2 ]; - src = fetchurl { - url = http://www.boddie.org.uk/python/downloads/libxml2dom-0.4.7.tar.gz; - sha256 = "0zh68adxn4l4b6q99jl1pi00171ah2marbbs8qfww4wpjavfw844"; - }; - pyCheck = "import libxml2dom.svg"; - meta = { - description = "provides a traditional DOM wrapper around the Python bindings for libxml2"; - homepage = http://www.boddie.org.uk/python/libxml2dom.html; - license = "LGPL3+"; - }; - }; - */ - - fpconst = t.pythonLibSetup.merge { - name = "fpconst-0.7.3"; - pyCheck = "import fpconst"; - src = fetchurl { - url="mirror://sourceforge/rsoap/fpconst-0.7.3.tar.gz"; - sha256 = "1a5c2e4a1ecefd9981988cea15068699eccbc55e350af3471e782083d390c727"; - }; - meta = { - description="Python Module for handling IEEE 754 floating point special values"; - homepage="http://chaco.bst.rochester.edu:8080/statcomp/projects/RStatServer/fpconst/"; - license = "GPLv2"; - }; - }; - - soappy = t.pythonLibSetup.merge { - name = "soappy-0.12"; - pyCheck = "from SOAPpy import WSDL"; - propagatedBuildInputs = [ t.fpconst ]; - # REGION AUTO UPDATE: { name="pywebcvs"; type = "svn"; url = "https://pywebsvcs.svn.sourceforge.net/svnroot/pywebsvcs/trunk"; } - src = sourceFromHead "pywebcvs-1493.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/pywebcvs-1493.tar.gz"; sha256 = "54e9faca87d8a59a22e06374b8416555cf76d3f411fa2be168ad542c2d8e6fc1"; }); - # END - postUnpack = "sourceRoot=$sourceRoot/SOAPpy"; - /* The release is buggy. I can't get list of dedicated netboots from ovh ? - src = fetchurl { - url = "http://switch.dl.sourceforge.net/sourceforge/pywebsvcs/SOAPpy-0.12.0.tar.gz"; - sha256 = "02a0wpir0gl0n9cl7a5hxliwsywvcw847i5in7i14i57kk6dl7rd"; - }; - patches = [ ./gentoo-python-2.5-compat.patch ]; - */ - meta = { - description = "SOAP implementation for Python"; - homepage="http://pywebsvcs.sourceforge.net/"; - license = "BSD"; - }; - }; - - sqlalchemy05 = t.pythonLibSetup.merge { - name = "sqlalchemy-0.5.5-svn-trunk"; - pyCheck = '' - import sqlalchemy - import sqlalchemy.orm - import sqlalchemy.orm.collections - ''; - # REGION AUTO UPDATE: { name="sqlalchemy05"; type = "svn"; url="http://svn.sqlalchemy.org/sqlalchemy/trunk"; } - src = sourceFromHead "sqlalchemy05-6076.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/sqlalchemy05-6076.tar.gz"; sha256 = "f35e6475996f7591d49affbc935c40b4c93e4cdaff86a50af9321774de2025b2"; }); - # END - meta = { - description = "sql orm wrapper for python"; - homepage = http://www.sqlalchemy.org; - license = "MIT"; - }; - postPhases = ["installMigration"]; - - buildInputs = [ t.setuptools /* required for migration lib */ ]; - - /* impure ? I don't care right now - Reading http://pypi.python.org/simple/decorator/ - Reading http://www.phyast.pitt.edu/~micheles/python/documentation.html - Best match: decorator 3.0.1 - Downloading http://pypi.python.org/packages/source/d/decorator/decorator-3.0.1.tar.gz#md5=c4130a467be7f71154976c84af4a04c6 - - iElectric: column.alter could be broken .. - */ - installMigration = - let src = { - # REGION AUTO UPDATE: { name="sqlalchemyMigrate"; type = "svn"; url="http://sqlalchemy-migrate.googlecode.com/svn/trunk"; } - src = sourceFromHead "sqlalchemyMigrate-569.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/sqlalchemyMigrate-569.tar.gz"; sha256 = "3b076b33aa13bb2923e719489fd7988a5660bd8d8e87dac03f453b510e2695f4"; }); - # END - }.src; in - '' - cd $TMP - mkdir migrate - cd migrate - unpackFile ${src} - cd * - python setup.py $setupFlags build - python setup.py $setupFlags install --prefix=$out - echo "import migrate.changeset.schema" | python - ''; - - /* - - mv $out/lib/python2.5/site-packages/sqlalchemy_migrate-0.5.5.dev_r0-py2.5.egg/* \ - $out/lib/python2.5/site-packages - */ - }; - - /* doesn't work on its own, its included in sqlalchemy05 for that reason. - sqlalchemyMigrate = t.pythonLibSetup.merge { - name = "sqlalchemy-migrate-svn"; - buildInputs = [ t.setuptools t.sqlalchemy05 ]; - pyCheck = '' - import migrate - import migrate.changeset - import migrate.changeset.schema - ''; - # REGION AUTO UPDATE: { name="sqlalchemyMigrate"; type = "svn"; url="http://sqlalchemy-migrate.googlecode.com/svn/trunk"; } - src = sourceFromHead "sqlalchemyMigrate-569.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/sqlalchemyMigrate-569.tar.gz"; sha256 = "2bfbd41e31c9dce4434ca4cb209338ccef1fd0394999b18111be838b79db703b"; }); - # END - meta = { - description = "sqlalchemy database versioning and scheme migration"; - homepage = http://packages.python.org/sqlalchemy-migrate/download.html; - license = "MIT"; - }; - }; - */ - - ### python applications - - pythonExStub = composableDerivation {} { - buildInputs = [p.makeWrapper]; - postPhases = ["wrapExecutables"]; - propagatedBuildInputs = [ t.pythonFull ]; # see [1] - - # adding $out to NIX_PYTHON_SITES because some of those executables seem to come with extra libs - wrapExecutables = '' - for prog in $out/bin/*; do - wrapProgram "$prog" \ - --set NIX_PYTHON_SITES "$NIX_PYTHON_SITES:$out" \ - --set PYTHONPATH "\$PYTHONPATH:$out" - done - ''; - }; - - pitivi = t.pythonExStub.merge { - name = "pitivi-0.11.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/sources/pitivi/0.11/pitivi-0.11.2.tar.bz2; - sha256 = "0d3bqgfp60qm5bf904k477bd8jhxizj1klv84wbxsz9vhjwx9zcl"; - }; - buildInputs = [ t.pygtk212 t.gstPython t.pygoocanvas t.zopeInterface t.dbusPython - p.intltool p.gettext p.makeWrapper p.gettext ]; - # why do have to add gtk-2.0 explicitely? - meta = { - description = "A non-linear video editor using the GStreamer multimedia framework"; - homepage = http://www.pitivi.org/wiki/Downloads; - license = "LGPL-2.1"; - }; - postInstall = '' - # set the python which has been used to compile this package - sed -i -e 's@#!.*@#!'"$(which python)@" $out/bin/pitivi - ''; - }; - - istanbul = t.pythonExStub.merge { - name = "istanbul-0.2.2"; - buildInputs = [ t.pygtk212 t.gstPython /*t.gnomePython (contained in gtk) t.gnomePythonExtras */ t.pythonXlib - p.perl p.perlXMLParser p.gettext]; - # gstPython can't be imported when building (TODO).. so just run true instead of python - configurePhase = ''./configure --prefix=""''; # DESTDIR is set below - postUnpack = '' - sed -i 's/$PYTHON/true/' istanbul-0.2.2/configure - mkdir -p $out/bin - export DESTDIR="$out" - ''; - src = fetchurl { - url = http://zaheer.merali.org/istanbul-0.2.2.tar.bz2; - sha256 = "1mdc82d0xs9pyavs616bz0ywq3zwy3h5y0ydjl6kvcgixii29aiv"; - }; - postInstall = "chmod a+x $out/bin/istanbul"; - meta = { - description = "A non-linear video editor using the GStreamer multimedia framework"; - homepage = http://live.gnome.org/Istanbul; - license = "LGPLv2"; - }; - }; - - all = lib.filter (x: - (isAttrs x) - && ((lib.maybeAttr "libPython" false x) == t.version) - && (lib.maybeAttr "name" false x != false) # don't collect pythonLibStub etc - ) (lib.flattenAttrs (removeAttrs t ["all"])); # nix is not yet lazy enough, so I've to remove all first -})) diff --git a/pkgs/development/interpreters/python-new/2.5/gentoo-python-2.5-compat.patch b/pkgs/development/interpreters/python-new/2.5/gentoo-python-2.5-compat.patch deleted file mode 100644 index 60c65faf015..00000000000 --- a/pkgs/development/interpreters/python-new/2.5/gentoo-python-2.5-compat.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/SOAPpy/Client.py b/SOAPpy/Client.py -index 7437049..13ba160 100644 ---- a/SOAPpy/Client.py -+++ b/SOAPpy/Client.py -@@ -40,11 +40,11 @@ - ################################################################################ - """ - -+from __future__ import nested_scopes -+ - ident = '$Id: Client.py,v 1.27 2005/02/21 20:27:09 warnes Exp $' - from version import __version__ - --from __future__ import nested_scopes -- - #import xml.sax - import urllib - from types import * -diff --git a/SOAPpy/GSIServer.py b/SOAPpy/GSIServer.py -index 48c1303..c7ad13d 100644 ---- a/SOAPpy/GSIServer.py -+++ b/SOAPpy/GSIServer.py -@@ -43,11 +43,11 @@ GSIServer - Contributed by Ivan R. Judson - ################################################################################ - """ - -+from __future__ import nested_scopes -+ - ident = '$Id: GSIServer.py,v 1.5 2005/02/15 16:32:22 warnes Exp $' - from version import __version__ - --from __future__ import nested_scopes -- - #import xml.sax - import re - import socket -diff --git a/SOAPpy/Server.py b/SOAPpy/Server.py -index b28153d..76ce0b4 100644 ---- a/SOAPpy/Server.py -+++ b/SOAPpy/Server.py -@@ -40,11 +40,11 @@ - ################################################################################ - """ - -+from __future__ import nested_scopes -+ - ident = '$Id: Server.py,v 1.21 2005/02/15 16:32:22 warnes Exp $' - from version import __version__ - --from __future__ import nested_scopes -- - #import xml.sax - import re - import socket -diff --git a/SOAPpy/Types.py b/SOAPpy/Types.py -index 6cc5456..62d44b2 100644 ---- a/SOAPpy/Types.py -+++ b/SOAPpy/Types.py -@@ -33,11 +33,11 @@ - ################################################################################ - """ - -+from __future__ import nested_scopes -+ - ident = '$Id: Types.py,v 1.19 2005/02/22 04:29:43 warnes Exp $' - from version import __version__ - --from __future__ import nested_scopes -- - import UserList - import base64 - import cgi diff --git a/pkgs/development/interpreters/python-new/2.5/nix-find-sites-2.5.patch b/pkgs/development/interpreters/python-new/2.5/nix-find-sites-2.5.patch deleted file mode 100644 index c856429b630..00000000000 --- a/pkgs/development/interpreters/python-new/2.5/nix-find-sites-2.5.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/site.py 2008-11-19 14:48:49.000000000 +0100 ---- Python-2.5-orig/Lib/site.py 2008-05-10 19:36:24.000000000 +0200 -+++ Python-2.5/Lib/site.py 2008-11-17 05:37:02.000000000 +0100 -@@ -390,6 +390,20 @@ - except ImportError: - pass - -+def addnixsitepackages(known_paths): -+ """ -+ used to add multiple site packages for /nix/store to sys.path also -+ evaluating the .pth files (http://docs.python.org/library/site.html#module-site) -+ """ -+ env_nix_sites = os.environ.get("NIX_PYTHON_SITES", None) -+ if env_nix_sites: -+ for path in env_nix_sites.split(":"): -+ -+ NIX_SITE = os.path.join(path, "lib", -+ "python" + sys.version[:3], -+ "site-packages") -+ addsitedir(NIX_SITE, known_paths) -+ return known_paths - - def main(): - abs__file__() -@@ -400,6 +414,7 @@ - paths_in_sys = addsitepackages(paths_in_sys) - if sys.platform == 'os2emx': - setBEGINLIBPATH() -+ paths_in_sys = addnixsitepackages(paths_in_sys) - setquit() - setcopyright() - sethelper() - diff --git a/pkgs/development/interpreters/python-new/2.5/python.nix b/pkgs/development/interpreters/python-new/2.5/python.nix deleted file mode 100644 index 932d29b4084..00000000000 --- a/pkgs/development/interpreters/python-new/2.5/python.nix +++ /dev/null @@ -1,68 +0,0 @@ -args: with args; -let inherit (lib) optional prepareDerivationArgs concatStringsSep fix; in - -composableDerivation { - mkDerivation = attr : stdenv.mkDerivation ( attr // { - C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") attr.buildInputs); - LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") attr.buildInputs); - }); - } { - - postPhases = ["runCheck"]; - - mergeAttrBy = { pyCheck = x : y : "${x}\n${y}"; }; - - # should be last because it sources setup-hook of this package itself - runCheck = '' - PATH=$out/bin:$PATH; . $out/nix-support/setup-hook; - echo -e "import sys\n$pyCheck\nprint \"import pyCheck ok\"" | python - ''; - - inherit (args) name; - - # everything can be overriden by composedArgsAndFun additional args - # assuming that if a module can be loaded that it does also work.. - flags = { - zlib = { buildInputs = [ zlib ]; pyCheck = "import zlib"; }; - gdbm = { buildInputs = [ gdbm ]; pyCheck = "import gdbm"; }; - sqlite = { buildInputs = [ sqlite ]; pyCheck = "import sqlite3"; }; - db4 = { buildInputs = [ db4 ]; }; # TODO add pyCheck - readline = { buildInputs = [ readline ]; }; # doesn't work yet (?) - openssl = { buildInputs = [ openssl ]; pyCheck ="import socket\nsocket.ssl"; }; - }; - - src = fetchurl { - url = http://www.python.org/ftp/python/2.5.2/Python-2.5.2.tar.bz2; - sha256 = "0gh8bvs56vdv8qmlfmiwyczjpldj0y3zbzd0zyhyjfd0c8m0xy7j"; - }; - - configureFlags = ["--enable-shared" "--with-wctype-functions"]; - - buildInputs = - optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [bzip2 ncurses]; - - patches = [ - # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff. - ./search-path.patch - - - # make python know about libraries reading .pth files - # http://docs.python.org/library/site.html#module-site - # TODO: think about security (see the other code contained in site.py) - ./nix-find-sites-2.5.patch - ]; - - preConfigure = '' - # Purity. - for i in /usr /sw /opt /pkg; do - substituteInPlace ./setup.py --replace $i /no-such-path - done - export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses" - ''; - - postInstall = " - rm -rf $out/lib/python2.5/test - "; - - } diff --git a/pkgs/development/interpreters/python-new/2.5/search-path.patch b/pkgs/development/interpreters/python-new/2.5/search-path.patch deleted file mode 100644 index 8fcddcb3f8d..00000000000 --- a/pkgs/development/interpreters/python-new/2.5/search-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py -*** Python-2.4.4-orig/setup.py 2006-10-08 19:41:25.000000000 +0200 ---- Python-2.4.4/setup.py 2007-05-27 16:04:54.000000000 +0200 -*************** -*** 279,288 **** - # Check for AtheOS which has libraries in non-standard locations - if platform == 'atheos': - lib_dirs += ['/system/libs', '/atheos/autolnk/lib'] -- lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) - inc_dirs += ['/system/include', '/atheos/autolnk/include'] -- inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) - - # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) - if platform in ['osf1', 'unixware7', 'openunix8']: - lib_dirs += ['/usr/ccs/lib'] ---- 279,289 ---- - # Check for AtheOS which has libraries in non-standard locations - if platform == 'atheos': - lib_dirs += ['/system/libs', '/atheos/autolnk/lib'] - inc_dirs += ['/system/include', '/atheos/autolnk/include'] - -+ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) -+ - # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) - if platform in ['osf1', 'unixware7', 'openunix8']: - lib_dirs += ['/usr/ccs/lib'] - From b86fd1a1ecec52dd6ddf4eed47b65d8b36b9715b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Apr 2010 11:21:15 +0000 Subject: [PATCH 295/313] * Added rfkill, a tool for controlling the wireless kill switch on Linux. svn path=/nixpkgs/trunk/; revision=21199 --- pkgs/os-specific/linux/rfkill/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/os-specific/linux/rfkill/default.nix diff --git a/pkgs/os-specific/linux/rfkill/default.nix b/pkgs/os-specific/linux/rfkill/default.nix new file mode 100644 index 00000000000..0e0f5a3ff0c --- /dev/null +++ b/pkgs/os-specific/linux/rfkill/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "rfkill-0.4"; + + src = fetchurl { + url = "http://wireless.kernel.org/download/rfkill/${name}.tar.bz2"; + sha256 = "1hb884vgyldci648azbx17w83gzynn0svrmfjgh3c2jzga1f846a"; + }; + + makeFlags = "PREFIX=$(out)"; + + meta = { + homepage = http://wireless.kernel.org/en/users/Documentation/rfkill; + description = "A tool to query, enable and disable wireless devices"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8da577cdf4f..0945d3f8064 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6358,6 +6358,10 @@ let inherit fetchurl stdenv; }; + rfkill = import ../os-specific/linux/rfkill { + inherit fetchurl stdenv; + }; + rt73fw = import ../os-specific/linux/firmware/rt73 { inherit fetchurl stdenv unzip; }; From 9e9f8e45b3e14d1e62ec353a75b43025828f8580 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Apr 2010 11:37:15 +0000 Subject: [PATCH 296/313] * Updated wpa_supplicant to 0.7.2. svn path=/nixpkgs/trunk/; revision=21200 --- pkgs/os-specific/linux/wpa_supplicant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 8920903791b..5e2e4b2972c 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, qt4 ? null}: stdenv.mkDerivation rec { - name = "wpa_supplicant-0.7.0"; + name = "wpa_supplicant-0.7.2"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "08aynxk842vg4if28ydza3mwkx2nvk9gw2vkbdlfn88vi1wgcd4x"; + sha256 = "1gnwhnczli50gidsq22ya68hixmdrhd1sxw202ygihvg6xsjl06z"; }; preBuild = '' From 0de19dec3bb660d8220baabe9a310d42c10dca67 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 21 Apr 2010 12:06:28 +0000 Subject: [PATCH 297/313] - Upgraded SIP to 4.10.2 - Upgraded PyQt to 4.7.3 svn path=/nixpkgs/trunk/; revision=21203 --- pkgs/development/python-modules/pyqt/default.nix | 6 +++--- pkgs/development/python-modules/python-sip/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index eb09a32d00c..820e272dee1 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, python, sip, qt4}: stdenv.mkDerivation { - name = "pyqt-x11-gpl-4.7.2"; + name = "pyqt-x11-gpl-4.7.3"; src = fetchurl { - url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.2.tar.gz; - sha256 = "097gxdr7jqv5a58z89djylm2b21x83crqn2fjsr5zmwhc0zwj5yv"; + url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.3.tar.gz; + sha256 = "0p12m2rjsm3igpqqmgn79my2h16vhxq8dma9ih1744hpnirdcjjp"; }; configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins"; diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix index c64d7be52f7..c1812bfec22 100644 --- a/pkgs/development/python-modules/python-sip/default.nix +++ b/pkgs/development/python-modules/python-sip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "sip-4.10.1"; + name = "sip-4.10.2"; src = fetchurl { url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz"; - sha256 = "16pdk86amcl4hnc9vv2y1ihl8ym9hjkh49andm4jahv4630qhc9h"; + sha256 = "1vw810fa3g59r3cnfizxykq7dg84zcgs278cwrksk7rsgz8gdn9q"; }; configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include"; From 108e86ce6cddf6fc1986b895189106fb01fe0807 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Apr 2010 12:32:16 +0000 Subject: [PATCH 298/313] * Update the firmware for the IWL 3945. svn path=/nixpkgs/trunk/; revision=21204 --- .../linux/firmware/iwlwifi-3945-ucode/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix index f3cff66ea5c..389d416f2a5 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -stdenv.mkDerivation { - name = "iwlwifi-3945-ucode-15.28.1.8"; +stdenv.mkDerivation rec { + name = "iwlwifi-3945-ucode-15.32.2.9"; src = fetchurl { - url = http://www.intellinuxwireless.org/iwlwifi/downloads/iwlwifi-3945-ucode-15.28.1.8.tgz; - sha256 = "0pwilsk8m9f5ihlp3wlam485a52lkbj2di5990bnz2m6ina9j8v2"; + url = "http://www.intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + sha256 = "0baf07lblwsq841zdcj9hicf11jiq06sz041qcybc6l8yyhhcqjk"; }; buildPhase = "true"; From 1aee2df93acd742e1654304ba2cc868188ba9696 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Wed, 21 Apr 2010 13:31:08 +0000 Subject: [PATCH 299/313] update libpcap to 1.1.1 and wireshark to 1.3.4 svn path=/nixpkgs/trunk/; revision=21205 --- pkgs/applications/networking/sniffers/wireshark/default.nix | 6 +++--- pkgs/development/libraries/libpcap/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index b12d846c171..38270f33ba2 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}: stdenv.mkDerivation { - name = "wireshark-1.3.2"; + name = "wireshark-1.3.4"; src = fetchurl { - url = http://www.wireshark.org/download/src/wireshark-1.3.2.tar.gz; - sha256 = "0sq0mk0iqsgcgd2gqspyfmjiql00d3ghq43qxywd8qb2jxfv1q5r"; + url = http://media-2.cacetech.com/wireshark/src/wireshark-1.3.4.tar.bz2; + sha256 = "00pyr3izg5dg8kr4sayp0fq8q360syfhs2nvj6b4ff1mdal7ra3x"; }; configureFlags = "--with-pcap=${libpcap}"; buildInputs = [perl pkgconfig gtk libpcap flex bison]; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 0c20c44ef90..cb01c2b47db 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { - name = "libpcap-1.1.0"; + name = "libpcap-1.1.1"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "073hy17pvm203c0z3zpkp1b37sblcgf49c6a03az7kbniizbc07b"; + sha256 = "11asds0r0vd9skbwfbgb1d2hqxr1d92kif4qhhqx2mbyahawm32h"; }; buildNativeInputs = [ flex bison ]; From 28695d990c46e20bea44776c6d42680dbdf9ded2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Apr 2010 14:02:28 +0000 Subject: [PATCH 300/313] * Thunderbird 3.0.4. svn path=/nixpkgs/trunk/; revision=21206 --- pkgs/applications/networking/mailreaders/thunderbird/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix index 101caa6825d..619c1e44ab4 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix @@ -10,14 +10,14 @@ }: -let version = "3.0"; in +let version = "3.0.4"; in stdenv.mkDerivation { name = "thunderbird-${version}"; src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "7a8a08f011901b4c0b737de2d7a226242935543d"; + sha1 = "5a6e89096da61a520e5cecb61f8afeb981f90412"; }; buildInputs = From 1c2fa602ee2a8ee1958c108d8109ad0283b79285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Wed, 21 Apr 2010 14:05:17 +0000 Subject: [PATCH 301/313] Added gdiff Haskell package. svn path=/nixpkgs/trunk/; revision=21207 --- .../development/libraries/haskell/gdiff/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/gdiff/default.nix diff --git a/pkgs/development/libraries/haskell/gdiff/default.nix b/pkgs/development/libraries/haskell/gdiff/default.nix new file mode 100644 index 00000000000..3ea5e4877fa --- /dev/null +++ b/pkgs/development/libraries/haskell/gdiff/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "gdiff"; + version = "1.0"; + sha256 = "35257b1090cf78f95d24c7a89920863c1d824652311fa5793693d7d06d96517b"; + meta = { + description = "Generic diff and patch"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4a977b852c5..9d4f276d9b3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -168,6 +168,10 @@ rec { inherit cabal mtl; }; + gdiff = import ../development/libraries/haskell/gdiff { + inherit cabal; + }; + getOptions = import ../development/libraries/haskell/get-options { inherit (pkgs) fetchurl sourceFromHead; inherit cabal mtl; From fca81fa9eed1a2143675650a9ef86a5ef305578e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Apr 2010 14:47:13 +0000 Subject: [PATCH 302/313] * Reverted a revert that should not have been done :-) * Add a version number to svnfs. svn path=/nixpkgs/trunk/; revision=21208 --- pkgs/tools/filesystems/svnfs/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index c4cd2670e89..4787ed77b59 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -1,6 +1,7 @@ -args: with args; +{ stdenv, fetchurl, automake, autoconf, subversion, fuse, apr, perl }: + stdenv.mkDerivation { - name = "svnfs"; + name = "svnfs-0.4"; src = fetchurl { url = http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-0.4.tgz; @@ -14,7 +15,6 @@ stdenv.mkDerivation { export LD_LIBRARY_PATH=${subversion}/lib ''; - NIX_CFLAGS_COMPILE="-I ${subversion}/include/subversion-1"; NIX_LDFLAGS="-lsvn_client-1"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "SvnFs is a filesystem written using FUSE for accessing Subversion repositories"; homepage = http://www.jmadden.eu/index.php/svnfs/; license = "GPLv2"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; }; } From 8a4805ba222cb2367e22c0e0f733baac0c717f62 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Apr 2010 14:47:13 +0000 Subject: [PATCH 303/313] * Updated nvidia-x11 to 195.36.15. svn path=/nixpkgs/trunk/; revision=21209 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 54e14b19726..b3aa4104fc7 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -2,7 +2,7 @@ let - versionNumber = "190.53"; + versionNumber = "195.36.15"; in @@ -15,12 +15,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "0ypm4ld8zvir5c6nc1a7x4wxkb0fdx13lf8a2fzi3fmvhpa8bag9"; + sha256 = "0wjcijmkkkpiw72fr2zm0v0x8dz5gf4mdgr329kldi52lb5lf85d"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; - sha256 = "0mm841563wy373hg5az42dncmvkzk8y7yxlij7axw4q1pjbihi80"; + sha256 = "17m0ia220rr0xvnpws251rk1l4gswkdgyhxcyrz0arr5dsr8dzb4"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From 7cdad5516461974430a4b9dc1bee234eefe1464f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Apr 2010 20:07:26 +0000 Subject: [PATCH 304/313] * Use OpenSSL's implementation of MD5, SHA-1 and SHA-256, as they're a bit faster. svn path=/nixpkgs/trunk/; revision=21218 --- pkgs/tools/package-management/nix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c655637d1fb..3138c0954e6 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { '' --with-store-dir=${storeDir} --localstatedir=${stateDir} --with-aterm=${aterm} --with-bzip2=${bzip2} + ${stdenv.lib.optionalString (openssl != null) "--with-openssl=${openssl}"} --disable-init-state ''; From 1f942f92bfaddb4353962404fc9415c371e3ec29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 21 Apr 2010 20:47:15 +0000 Subject: [PATCH 305/313] Making utillinux build also 'write'. (Thank you, niksnut) svn path=/nixpkgs/trunk/; revision=21219 --- pkgs/os-specific/linux/util-linux-ng/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux-ng/default.nix index 166c9358759..4b8c01f1457 100644 --- a/pkgs/os-specific/linux/util-linux-ng/default.nix +++ b/pkgs/os-specific/linux/util-linux-ng/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { configureFlags = '' --disable-use-tty-group + --enable-write ${if ncurses == null then "--without-ncurses" else ""} ''; From 80862759f26e7ddac7a71daa0380bbe5e12b3cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 21 Apr 2010 21:35:38 +0000 Subject: [PATCH 306/313] Updating util-linux, so the 2nd util-linux change in few minutes; that may annoy less. svn path=/nixpkgs/trunk/; revision=21221 --- pkgs/os-specific/linux/util-linux-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux-ng/default.nix index 4b8c01f1457..226db5f1b3d 100644 --- a/pkgs/os-specific/linux/util-linux-ng/default.nix +++ b/pkgs/os-specific/linux/util-linux-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses ? null, ... }: stdenv.mkDerivation rec { - name = "util-linux-ng-2.17.1"; + name = "util-linux-ng-2.17.2"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux-ng/v2.17/${name}.tar.bz2"; - sha256 = "140k32jqg9192vskdb3p98q99qgr14029h975nw21p426zm1kh79"; + sha256 = "13qifk3i1x59q45fpdz8qnnm7vrhd2zshy5295vhpcjsd8dq1bn9"; }; configureFlags = '' From 5acee5db82f3cc7f481a22150d3abf7fb95be007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 22 Apr 2010 09:57:02 +0000 Subject: [PATCH 307/313] Fixing xterm's setting of gid in its pts terminals (group tty) svn path=/nixpkgs/trunk/; revision=21224 --- pkgs/applications/misc/xterm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index fb30bbe1279..c9914319cc0 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { freetype pkgconfig libXft luit]; configureFlags = "--enable-wide-chars --enable-256-color --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit - --enable-mini-luit"; + --enable-mini-luit --with-tty-group=tty"; meta = { homepage = http://invisible-island.net/xterm; From a745097710fe82aaf95144da62229717541e71fe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Apr 2010 13:09:02 +0000 Subject: [PATCH 308/313] * Give Python 3.1 a lower priority so that it isn't installed by default when you do "nix-env -i python" and to allow it to be installed in the same profile as Python 2.x. * Disambiguate between the variants of Python 2.x. svn path=/nixpkgs/trunk/; revision=21237 --- pkgs/top-level/all-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0945d3f8064..607e59f1a5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2678,7 +2678,7 @@ let inherit fetchurl stdenv zlib bzip2 gdbm; }; - python25Full = python25Base.passthru.function { + python25Full = lowPrio (python25Base.passthru.function { # FIXME: We lack ncurses support, needed, e.g., for `gpsd'. db4 = if getConfig ["python" "db4Support"] true then db4 else null; sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null; @@ -2688,7 +2688,7 @@ let tcl = if getConfig ["python" "tkSupport"] true then tcl else null; libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null; xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null; - }; + }); python26Base = composedArgsAndFun (import ../development/interpreters/python/2.6) { inherit fetchurl stdenv zlib bzip2 gdbm; @@ -2696,7 +2696,7 @@ let sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null; }; - python26Full = python26Base.passthru.function { + python26Full = lowPrio (python26Base.passthru.function { # FIXME: We lack ncurses support, needed, e.g., for `gpsd'. db4 = if getConfig ["python" "db4Support"] true then db4 else null; sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null; @@ -2706,13 +2706,13 @@ let tcl = if getConfig ["python" "tkSupport"] true then tcl else null; libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null; xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null; - }; + }); - python31Base = composedArgsAndFun (import ../development/interpreters/python/3.1) { + python31Base = lowPrio (composedArgsAndFun (import ../development/interpreters/python/3.1) { inherit fetchurl stdenv zlib bzip2 gdbm; arch = if stdenv.isDarwin then darwinArchUtility else null; sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null; - }; + }); pyrex = pyrex095; From 2894233ff6172bb69e16766680fcd6e94dfaa0b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 22 Apr 2010 14:01:21 +0000 Subject: [PATCH 309/313] Updating xterm so it releases the effective gid (for setgid to utmp purposes). svn path=/nixpkgs/trunk/; revision=21239 --- pkgs/applications/misc/xterm/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index c9914319cc0..9f6a8a59e72 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -12,8 +12,19 @@ stdenv.mkDerivation rec { --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit --enable-mini-luit --with-tty-group=tty"; + # Hack to get xterm built with the feature of releasing a possible setgid of 'utmp', + # decided by the sysadmin to allow the xterm reporting to /var/run/utmp + # If we used the configure option, that would have affected the xterm installation, + # (setgid with the given group set), and at build time the environment even doesn't have + # groups, and the builder will end up removing any setgid. + postConfigure = '' + echo '#define USE_UTMP_SETGID 1' + ''; + meta = { homepage = http://invisible-island.net/xterm; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; }; } - From 1bf1500d3993f9040e676c4d5a679499ebbb2951 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 22 Apr 2010 14:01:57 +0000 Subject: [PATCH 310/313] Added Apache Felix gateway and remote shell packages svn path=/nixpkgs/trunk/; revision=21240 --- pkgs/servers/felix/default.nix | 22 ++++++++++++++++++++++ pkgs/servers/felix/remoteshell.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++++++++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/servers/felix/default.nix create mode 100644 pkgs/servers/felix/remoteshell.nix diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix new file mode 100644 index 00000000000..c600573ba86 --- /dev/null +++ b/pkgs/servers/felix/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "apache-felix-2.0.5"; + src = fetchurl { + url = http://apache.xl-mirror.nl/felix/org.apache.felix.main.distribution-2.0.5.tar.gz; + sha256 = "14nva0q1b45kmmalcls5yx97syd4vn3vcp8gywck1098qhidi66g"; + }; + buildCommand = + '' + tar xfvz $src + cd felix-framework-* + ensureDir $out + cp -av * $out + ''; + meta = { + description = "Apache Felix OSGi gateway"; + homepage = http://felix.apache.org; + license = "ASF"; + maintainers = [ stdenv.lib.maintainers.sander ]; + }; +} diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/servers/felix/remoteshell.nix new file mode 100644 index 00000000000..4d6a8d8318f --- /dev/null +++ b/pkgs/servers/felix/remoteshell.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "apache-felix-remoteshell-bundle-1.0.4"; + src = fetchurl { + url = http://apache.proserve.nl/felix/org.apache.felix.shell.remote-1.0.4.jar; + sha256 = "1bgahzs9nnnvfr0yyh9s0r6h1zp2ls6533377rp8r1qk2a4s1gzb"; + }; + buildCommand = + '' + ensureDir $out/bundle + cp ${src} $out/bundle/org.apache.felix.shell.remote-1.0.4.jar + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 607e59f1a5e..e8b5c14c896 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5476,6 +5476,14 @@ let inherit fetchurl stdenv erlang spidermonkey icu getopt curl; }; + + felix = import ../servers/felix { + inherit stdenv fetchurl; + }; + + felix_remoteshell = import ../servers/felix/remoteshell.nix { + inherit stdenv fetchurl; + }; fingerd_bsd = import ../servers/fingerd/bsd-fingerd { inherit fetchurl stdenv; From 5d04ec0364383edb7fb9ee5ea10128a65b75c0ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 22 Apr 2010 18:16:18 +0000 Subject: [PATCH 311/313] Updating openssh, fixing libedit for openssh to link well with it, and... here we finally have sftp with some kind of 'readline'! svn path=/nixpkgs/trunk/; revision=21246 --- pkgs/development/libraries/libedit/default.nix | 6 +++++- pkgs/tools/networking/openssh/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index a023e1ceea9..2121449af5a 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { name = "libedit-20090923-3.0"; @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "02j66qbd1c9wfghpjb8dzshkcj4i0n9xanxy81552j3is9ilxjka"; }; + postInstall = '' + sed -i s/-lcurses/-lncurses/g $out/lib/pkgconfig/libedit.pc + ''; + propagatedBuildInputs = [ ncurses ]; meta = { diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 57e0f50a243..e511ec415a2 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, openssl, perl +{ stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig , pamSupport ? false, pam ? null , etcDir ? null , hpnSupport ? false @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { - name = "openssh-5.4p1"; + name = "openssh-5.5p1"; src = fetchurl { - url = "ftp://ftp.nluug.nl/pub/security/OpenSSH/${name}.tar.gz"; - sha256 = "0kj0qp43dn2pnkcgrbbhm2r9db448ppsmmzh22mj8j0h0h6yg5mf"; + url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/${name}.tar.gz"; + sha256 = "12kywhjnz6w6kx5fk526fhs2xc7rf234hwrms9p1hqv6zrpdvvin"; }; patchPhase = stdenv.lib.optionalString hpnSupport @@ -29,12 +29,13 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ zlib openssl perl ] + [ zlib openssl perl libedit pkgconfig ] ++ stdenv.lib.optional pamSupport pam; configureFlags = '' --with-mantype=man + --with-libedit=yes ${if pamSupport then "--with-pam" else "--without-pam"} ${if etcDir != null then "--sysconfdir=${etcDir}" else ""} ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8b5c14c896..f34cb0c8218 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1274,7 +1274,7 @@ let }; openssh = import ../tools/networking/openssh { - inherit fetchurl stdenv zlib openssl pam perl; + inherit fetchurl stdenv zlib openssl pam perl libedit pkgconfig; pamSupport = getPkgConfig "openssh" "pam" true; hpnSupport = getPkgConfig "openssh" "hpn" false; etcDir = getPkgConfig "openssh" "etcDir" "/etc/ssh"; From c12db8f8dc8c4e3e03e3f283330c9b1f107d81c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 22 Apr 2010 20:12:09 +0000 Subject: [PATCH 312/313] I wrote wrong the openssh url. Btw, I changed the source server, because the old mirror at Ultrech did not have the latest openssh even 6 days after the 5.5 release. svn path=/nixpkgs/trunk/; revision=21247 --- pkgs/tools/networking/openssh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index e511ec415a2..cd3074546f4 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "openssh-5.5p1"; src = fetchurl { - url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/${name}.tar.gz"; + url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; sha256 = "12kywhjnz6w6kx5fk526fhs2xc7rf234hwrms9p1hqv6zrpdvvin"; }; From 93d2b4b7bfe5c78e36c93f94a0c057cde04b580f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 22 Apr 2010 20:12:26 +0000 Subject: [PATCH 313/313] Updating the intel x11 video drivers. (I know I modified an automatically generated file, but I don't imagine well the consequences of this) svn path=/nixpkgs/trunk/; revision=21248 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 95c29dea28e..84de382d19c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1528,11 +1528,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.10.0"; + name = "xf86-video-intel-2.11.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.10.0.tar.bz2; - sha256 = "1as8zk6b74q9d3ynq0i89z9vzx79lzz88azjypb7rnwkvj8xcvg4"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.11.0.tar.bz2; + sha256 = "0kss9xpk160j13yvcb0s0k5hhvzcqmhplscmfwsk5cgk4ny2qafv"; }; buildInputs = [pkgconfig dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libXext xextproto xf86driproto libXfixes xineramaproto xorgserver xproto libXvMC ]; })) // {inherit dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libXext xextproto xf86driproto libXfixes xineramaproto xorgserver xproto libXvMC ;};